Re: Branch causes missing revs and errors merging

Anyways, in regards to your original question about branching and
merging, Subversion does support the modified WC copy branch/merge
easily enough.

1) Check out the trunk
$svn co file:///svn/repo/trunk
...
Checked out revision 18.

2) Look at the log for whats changed on the branch

$ svn log file:///svn/repo/branch/b2 -v --stop-on-copy
------------------------------------------------------------------------
r18 | fbaksik | 2007-02-15 09:29:53 -0500 (Thu, 15 Feb 2007) | 1 line
Changed paths:
   A /branch/b2/another_new_fie
   D /branch/b2/bar
   M /branch/b2/foo

More b2 branch changes.
------------------------------------------------------------------------
r17 | fbaksik | 2007-02-15 09:25:46 -0500 (Thu, 15 Feb 2007) | 1 line
Changed paths:
   A /branch/b2 (from /trunk:3)
   M /branch/b2/bar
   D /branch/b2/baz
   A /branch/b2/new_branch_changes

Branch from trunk v3 with mods
------------------------------------------------------------------------

Note: In the log of r17 the line:
   A /branch/b2 (from /trunk:3)

This indicates I need to start the merge from revision 3, not from revision 16.

3) perform the merge
merge -r3:18 file:///svn/repo/branch/ .
$ svn merge -r3:18 file:///svn/repo/branch/b2 .
D bar
D baz
U foo
A another_new_fie
A new_branch_changes

$ svn merge -r16:18 file:///svn/repo/branch/b2 .
svn: Unable to find repository location for
'file:///svn/repo/branch/b2' in revision 16

You can't use r16 because nothing about the b2 branch existed in revision 16.

:-)
Frodak

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 15 15:59:38 2007