Re: Merge from trunk to branch, then branch to trunk

Rob van Oostrum wrote:
> You should look at svnmerge and especially take note of the -b
> (bidirectional) flag. That should help you a great deal.
>
> http://www.orcaware.com/svn/wiki/Svnmerge.py

Second the suggestion for svnmerge, but the -b flag caused a lot of
trouble for us. AFAICT, it boiled down to: it seems -b assumes that when
you merge, you NEVER make changes before commuting the merge. Even if
you never make tweaks before committing the merge, you still may have
conflicts which need to be fixed before commit.

We quit using -b and haven't had any trouble since.

Reid

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 26 01:23:50 2007