[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: BUG: Wrong merge range

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 26 Sep 2008 13:55:56 +0100

2008/9/26 Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>:
> On 25/09/2008, phahn <pjtr.hahn_at_googlemail.com> wrote:
>> cite:
>> "If you have already merged some changes from this branch, hopefully
>> you will have made a note of the last revision merged in the log
>> message when you committed the change. In that case, you can use Show
>> Log for the Working Copy to trace that log message. Use the end point
>> of the last merge as the start point for this merge. For example, if
>> you have merged revisions 37 to 39 last time, then the start point for
>> this merge should be revision 39."
>>
>> The example says: 37-39, 39- .... and not 37-39, 40- ...
>
> You have a point here. The TSVN documentation should indicate here
> that TSVN expects the next revision, so the start point for the second
> merge should be 40 (or the next higher applicable number).

You're right, that line in the docs is wrong - it comes from the help
for the original merge dialog.

> Perhaps the TSVN documentation could use a call-out in this chapter to
> indicate the difference from the subversion command line parameters,
> but OTOH we must not feel obliged to keep track of *all* available
> subversion clients and point out differences in parameters between
> them and TSVN.

Good idea. It is on my to-do list.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-09-26 14:56:11 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.