On Wed, 15 Aug 2007, Jon Schewe wrote: > I've seen some references to the errors I'm getting, but not necessarily > the same branching strategy. > > The setup I have is each developer has their own branch to work on. On > a regular basis they merge changes from the trunk into their development > branch and when a piece of functionality is finished they merge their > changes into the trunk. Then they continue to develop on their branch > and the cycle repeats. Is svnmerge meant to handle this situation? Or > is this the general graph merge that is referenced in other posts that > svnmerge doesn't handle?
svnmerge.py tries to handle this via its --bidirectional option for 'merge'. However, it doesn't do a great job of it (due to a deficiency in Subversion itself, where it only stores a single parent for a change), and can lose changes made during merge conflict resolution.
pgpv1kHVhpwim.pgp
Description: PGP signature
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
