I just tried to merge the swig-py3 branch into trunk [not in order to commit the merge, but only in order to run 'svn diff' on its result], and got the following output from 'svn merge':
[[[ Summary of conflicts: Tree conflicts: 1 Searching tree conflict details for 'build/generator/util/executable.py' in repository: Checking r1819556... done Tree conflict on 'build/generator/util/executable.py': Changes destined for a file arrived via the following revisions during merge of '^/subversion/branches/swig-py3/build/generator/util/executable.py:1819163-1819564': No such file or directory was found in the merge target working copy. '^/subversion/trunk/build/generator/util/executable.py' was deleted in r1819556 by danielsh. Subversion is not smart enough to resolve this tree conflict automatically! See 'svn help resolve' for more information. Select: (p) Postpone, (r) Mark as resolved, (h) Help, (q) Quit resolution: h ]]] That's the correct diagnosis: the branch changed a file (build/generator/util/executable.py) that was later deleted on trunk. So that worked well. That said, I'm a bit confused by the language "via the following revisions …:" where the colon isn't followed by one or more revision numbers. Is it just an empty set of revisions? Cheers, Daniel
