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

Re: Merge description in the docs

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 08 Mar 2008 08:43:14 +0100

Simon Large wrote:
> Hi folks,
> I'm still trying to get my head around the reintegrate merge. Please
> stop me when I go wrong.
> I am developing a new feature, so I create a branch from trunk and
> start hacking away. To avoid potential conflicts I want to keep it
> synced up to trunk and the easiest way to do that now is to use
> reintegrate, merging from the trunk URL into my branch WC.
> After much hacking my branch is done and I want to merge back to
> trunk. I use the reintegrate merge for this too, but this time merging
> from the branch URL into my trunk WC.
> In order for this to work everyone working on the branch *must* be
> using a 1.5 client in order to record the mergeinfo. In order for this
> to work efficiently we must be using a 1.5 server, although a pre-1.5
> will do it but possibly very slowly.
> We have 2 other merge options. Merge a range would also work for
> syncing the branch to trunk, and it uses the mergeinfo too so there is
> no need to specify a range. But the primary role for this feature now
> is cherry picking merges. It may be needed if the specific conditions
> for a reintegrate merge are not met.
> Merge 2 trees does what it always did and is now of limited use. It
> does not take account of merge tracking information.
> Are we getting there?

I think you got it right, yes. But maybe you could ask Mark Phippard or
on the Subversion list for confirmation?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-03-08 08:43:28 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.