[Svnmerge] Question about usage with developer branches

Raman Gupta rocketraman at fastmail.fm
Wed Aug 15 15:24:14 PDT 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?

Yes, svnmerge should handle this use case just fine. The only caveat
is to make sure to always use the -b (bidirectional) flag.

What errors are you getting?

Cheers,
Raman



More information about the Svnmerge mailing list