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? Thanks. ________________________________________________________________________ Jon Schewe | http://www.mtu.net/~jpschewe If you see an attachment named signature.asc, this is my digital signature. See http://www.gnupg.org for more information. For I am convinced that neither death nor life, neither angels nor demons, neither the present nor the future, nor any powers, neither height nor depth, nor anything else in all creation, will be able to separate us from the love of God that is in Christ Jesus our Lord. - Romans 8:38-39 _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
