[Svnmerge] Bugs when merging revisions that modify and deletefiles

[Alan Barrett]

On Mon, 13 Feb 2006, Archie Cobbs wrote:
> 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.

If the skipped change affected the same file, then I would agree that
it's a real conflict.  But in the case under discussion, the skipped
change does not affect the same file.

--apb (Alan Barrett)