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

Re: [TSVN] Revision ranges when merging

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-08-26 13:46:30 CEST

Klaus Drechsler wrote:
> Hi,
>
> I am a little bit confused again.
> I have created a branch when my trunk was at revision 37.
> The branch therefore has revision 38.
>
> Some time later I want to merge the branch back to the trunk.
> In the dialog (after I selected merge in the context menu) I have to enter
> the From: and To: revisions.
>
> When I select "show log" and select revision 38 and click on ok the input
> field shows revision 37 (not 38).
>
> My understanding for that is: revision 38 is created after the branch, so I
> want to start before the branch, that is at revision 37.
>
> But than the svn book is wrong. Here:
> http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.commonuses.wholebr
> is an example merging a whole branch to the trunk. And there the From:
> revision is the revision after the branch was created (in my case above this
> would be r38).
>
> Who is wrong? The svn book, or TSVN?

Neither. In TSVN you select the revisions you want to merge back into
the trunk, and TSVN automatically decrements the start by 1 because
merging requires a diff against the previous revision.

According to the SVN book, you use 38:BranchHead which is correct.

In TSVN you select the revisions you want included in the merge. r38 was
the branch creation, so you don't actually need to merge it back into
trunk, so in ShowLog you would select 39:BranchHead. TSVN decrements
that by 1 and you end up with the same as the SVN book.

We tried to make merging more intuitive for a GUI client by doing it
this way, but people who are used to the command line client now
sometimes find it confusing :-(

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 26 13:46:09 2005

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