[Svnmerge] Bugs when merging revisions that modify and delete files

[Giovanni Bajo]

Alan Barrett <apb at cequrux.com> wrote:

>> I attach two scripts demonstrating what I believe are two bugs in
>> svnmerge.py.  I am using the version of svnmerge.py distributed
>> with subversion-1.3.0.  It identifies itself as "svnmerge r17383
>> modified: 2005-11-16 01:57:56 +0100 (Wed, 16 Nov 2005)".

Both bugs are actually a same bug in svnmerge init, which was already fixed in
SVN. You can try with a later version of svnmerge.py:
http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py. r18345
is fine for instance.

Thanks for the detailed bug report!

Giovanni Bajo