Re: Non-trivial branch+merge best practice?

>>>>> "Ivan Skytte Jørgensen" <isj.intecbilling@gmail.com>:

> svnmerge.py looks almost right, but not quite. Branch-to-branch
> merges do not seem to be supported unless you specify the -prop
> differently for each maintenance branch.

Do you mean branch-to-branch as opposed to branch-to-trunk/trunk-to-branch?

I don't think there's any principal difference between the two. But
you will have to set it up for each branch you wish to do merges
between.

Hm... looking at the tutorials at http://www.orcaware.com/svn/wiki/Svnmerge.py
there are no examples of inter-branch merges, but I guess that the
setup will be similar to what you do on trunk for each branch you wish
to merge back...?
  http://www.orcaware.com/svn/wiki/Svnmerge.py#Merging_branches_back_to_trunk

You could try asking on the svnmerge list.
        http://dir.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 17 10:46:21 2007