[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: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Fri, 19 Sep 2008 13:51:22 +0200

Hi Peter,

On 19/09/2008, phahn <pjtr.hahn_at_googlemail.com> wrote:
> Hello,
> I think there is a bug in " > Merge > Merge range of revisions "
> dialog.
> The start revision set in "Revisions to merge" is decremented instead
> of incremented.
> E.g.
> If we would like to merge r 105 : 110 that is in fact changeset
> 106,107,108,109,110 i.e. the range of revisions should be from 106 to
> 110.
> That is exactly that the svn cmdline client does if you say:
> 'svn merge -r 105-110 //REPO/PATH //WK/PATH'
> Tortoise instead tries to merge from 104-110 if you say 105-110. This
> results in merging the same changes twice and producing conflicts.

Not a bug, but a difference in interpretation. TSVN assumes users talk
about a revision as 'all the changes that were committed in that
revision'. When merging, you say 'I want to merge the changes made in
revisions x through y'. In SVN you must supply two revisions to
indicate 'all changes made after revision X up to and including Y'.

So in a sense you are incorrectly giving the SVN style input to an
TSVN input field. Behind the scene TSVN 'translates' the input to what
SVN needs by subtracting 1 from the inital revision number given by
the user.

   // \\  @@     "De Chelonian Mobile"
  / \_/ \/._)    TortoiseSVN
 <\_/_\_/ /      The coolest Interface to (Sub)Version Control
  /_/   \_\      Check out 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-19 13:51:33 CEST

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