[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: phahn <pjtr.hahn_at_googlemail.com>
Date: Mon, 22 Sep 2008 05:36:50 -0700 (PDT)

Hi,

Hmm, ok, I didn't knew that, but I doubt it is a good idea to use a
different interpretation then the 'reference implementation'.
IMHO it's not good for software to try to be more clever then the
user.

In fact if I use the traditional way of specifiieng two URLs and
revisions it works like the svn cmdline client and therefor this
behaviour is even more confusing and inconsistent.
This is especially true since the help file is saying something
different by explaining the 'default' behaviour of svn.

cite:
"Merge a range of revisions
This method covers the case when you have made one or more revisions
to a branch (or to the trunk) and you want to port those changes
across to a different branch.

What you are asking Subversion to do is this: “Calculate the changes
necessary to get [FROM] revision 1 of branch A [TO] revision 7 of
branch A, and apply those changes to my working copy (of trunk or
branch B).” "

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."

Maybe this should be revised again.

regards,

Peter

> Hi Peter,
>
> On 19/09/2008, phahn <pjtr.h..._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.
>
> --
> Regards,
>
> Jean-Marc
>
> ----------------
>     ___
>    // \\  @@     "De Chelonian Mobile"
>   / \_/ \/._)    TortoiseSVN
>  <\_/_\_/ /      The coolest Interface to (Sub)Version Control
>   /_/   \_\      Check outhttp://tortoisesvn.net
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org

---------------------------------------------------------------------
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-22 14:37:51 CEST

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