Dustin J. Mitchell wrote: > On Mon, Mar 31, 2008 at 5:43 PM, John Ricklefs > <[EMAIL PROTECTED]> wrote: >> I'm not sure if there is something I am missing that I can tell our >> developers to do to try to simplify this, except to run each of the >> above three merges independently, resolving conflicts and committing >> each time. Has anyone else seen this behavior, or have a better >> workaround to suggest? > > That's usually my solution. svnmerge doesn't have a good way to > determine what combinations of revisions will create a conflict (save > trying them all, which would take forever). Generally, when this > happens, I just revert my merge and take a guess as to which revision > range I should merge to generate only one conflict.
Instead of guessing, you can run the merge with -v, which will report the ranges being merged. Then just do the same ranges with -r, one at a time. Cheers, Raman Gupta _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
