Thomas F. O'Connell wrote: > I'll check out the patch. In the meantime, I'll go ahead and be more > specific about the commands since it's easy, and I just ran them. Here's > what happened: > > I had just merged several changes from branches/branch-2 to trunk. I > typically do all my merges as: > > svnmerge.py merge -S $MODIFIED_BRANCH -b > > Now I wanted to merge from the trunk to branches/branch-1. > > cd branches/branch-1 > svnmerge.py merge -S $TRUNK -b > > When I tried svn ci at this point, I got the warning about the conflict.
I just tried to reproduce this and was unable to. Could you provide a reproduction recipe? You could also print the output of "svn pl --verbose $URL" for the head of each branch, and trunk. Cheers, Raman Gupta _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
