Dustin J. Mitchell wrote: > On Wed, May 14, 2008 at 9:43 PM, JL <[EMAIL PROTECTED]> wrote: >> When I commit these merges into the trunk I get a revision number. (eg, >> revision 52). The problem is when I go back to my branch and use >> svnmerge to update the branch with the latest trunk changes, it sees >> revision 52 as a revision available for merging, and when it does the >> merge, it conflicts on all the binary files. How do I indicate that >> revision 52 was actually a merge from the branch and therefore there is >> no need to merge it back to the branch? I can 'block' it however this >> doesn't seem to be the right way of doing it. > > --bidirectional is supposed to fix that. Are you always using that > flag (even with the 'avail' subcommand)?
Or grab the latest trunk version of svnmerge.py which should ignore rev 52 automatically, even without --bidirectional. Cheers, Raman _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
