Documenting the merge process for TortoiseSVN

Hi folks,

I'm still trying to get my head around the reintegrate merge for
porpoises of updating the TSVN help file. 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 merge from
the trunk URL into my branch WC, merging all revisions from branch
creation to HEAD. Merge tracking will ensure that only revisions not
yet merged are included. Reintegrate is not appropriate in this
situation. (But what happens if I specify reintegrate anyway?)

After much hacking my branch is done and I want to merge back to
trunk. For this task I use the reintegrate merge. What is not clear is
how this differs from merging the diff between branch tip and trunk
tip, which is the method previously used. According to the svnbook
nightly that is effectively what happens, so why a new command?

Also, what happens in the reintegrate case if the branch is not fully
in sync. Does it fail or does it silently undo the most recent trunk
changes that were not synced back to the branch?

In order for all 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 also be using a 1.5 server. A pre-1.5
will work, but possibly very slowly. And what about a 1.5 repository?

Merge 2 different URLs does what it always did and does not take
account of merge tracking information?

Thanks,

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org