[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: Thu, 25 Sep 2008 09:00:31 -0700 (PDT)

On Sep 24, 7:19 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> phahn wrote:
> > As I said already. The help installed with the client is saying
> > something different and describes the same intepretation the official
> > svn client is using.
> It doesn't say something different (I just checked). But it doesn't say
> how the entered revisions are used either.

The is not true. The cite in my second post was from the help file.

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

... the CHANGES necessary to get FROM revision 1 ... TO revision
7 !!!!

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

The more I think about this the more it hurts *G*

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-25 18:05:27 CEST

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