[Svnmerge] Bugs when merging revisions that modify and deletefiles

[Tilmann Singer]

* Karsten Sperling <karsten.sperling at rhe.co.nz> [20061218 03:22]:
> I've run into this problem a number of times now and ended up with bad
> merges (the "skipping" message is quite easy to overlook in large
> merges). In the thread in February there was talk about adding --force
> to the svn commandline, but then the thread just stops.

Attached is a patch that adds the --force option to svnmerge.py. I
don't know if it still applies - I was using a svnmerge.py version
from 2006-09-22.


Til
-------------- next part --------------
--- client-side/svnmerge.py	2006-12-18 09:50:13.000000000 +0100
+++ scripts/admin/svnmerge.py	2006-11-24 21:24:05.000000000 +0100
@@ -1163,7 +1176,7 @@
 
         if not record_only:
             # Do the merge
-            svn_command("merge -r %d:%d %s %s" % \
+            svn_command("merge --force -r %d:%d %s %s" % \
                         (start - 1, end, opts["head-url"], branch_dir))
 
     # Write out commit message if desired