[Svnmerge] Problem with multiple groups of revisions to merge

Simon Lucy simon.lucy at objective2k.com
Mon Jan 26 15:23:06 PST 2009


Jon Schewe wrote:
> I've noticed that if I have a list of revisions (123,130-150,165) to
> merge that svnmerge iterates over each group and does the underlying
> "svn merge" command. However if there is a conflict svnmerge just keeps
> going on with the next set of changes, which can make resolving the
> conflicts very difficult. Is there a way to automatically tell svnmerge
> to only continue on with the next grouping of changes if there are
> currently no conflicts in the working copy
>   
Not that I'm aware of.  My usual method is to revert and do the svnmerge 
in smaller pieces walking around the conflicts where I could.

S




More information about the Svnmerge mailing list