[Svnmerge] Bugs when merging revisions that modify and deletefiles

[Daniel Rall]

On Wed, 10 Jan 2007, Giovanni Bajo wrote:

> On 12/18/2006 9:55 AM, Tilmann Singer wrote:
> 
> >> 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.
> 
> > ------------------------------------------------------------------------
> > 
> > --- 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
> > 
> > 
> > ------------------------------------------------------------------------
> 
> +1. This saved my day as well. If you write up a decent commit message 
> for this, I'm happy to commit it.

After reading this thread, I've committed a variation of this change
for both 'merge' and 'rollback' in r23052.

- Dan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070117/c1c98a3d/attachment-0001.pgp>