[Svnmerge] Bugs when merging revisions that modify and deletefiles

[Archie Cobbs]

Alan Barrett wrote:
> I don't see how svnmerge could ask svn to do it all in a single
> operation, since we want to merge revisions (a) and (c) without merging
> the intervening revision (b).
> 
> My script runs "svnmerge.py -r5,7".  svnmerge runs these two
> "svn merge" commands"
> 
>     svn merge -r 4:5 file:///wherever/repo/trunk .
>     svn merge -r 6:7 file:///wherever/repo/trunk .
> 
> The first "svn merge" command edits the file; this is merging
> item (a) from the earlier list.  The second "svn merge" command
> fails to delete the file, presumably because it sees that the
> working copy had been modified.
> 
> svnmerge could, in theory, make this work by deleting the file itself
> after the second "svn merge", or by reverting the edits before the
> second "svn merge".  But doing that would require a lot more work, and
> may be outside the scope of what svnmerge is intended to do.

In my opinion this is a "real" conflict. svnmerge would be acting
too presumptiously to automatically remove the file, as it could
possibly be that the deletion is invalid without the intervening
change that was skipped. E.g., perhaps some needed code was moved
to another file in the intervening revision.

So svnmerge's behavior is as designed: pass through the "Skipping.."
message to the user and let him/her figure out what to do.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com