Merging the double-delete branch back to trunk

The double-delete branch solves issue #3156
<http://subversion.tigris.org/issues/show_bug.cgi?id=3156> "Delete
should conflict with delete (at the repos level)", which is necessary to
allow us to detect some tree conflicts such as "rename A B" versus
"rename A C".

Solving this problem brings to light a bug in the way replacements are
handled in the WC, which shows up in merge_tests 33; see the issue for
more details.

We have held off merging this solution in the hope that somebody might
fix the WC problem, but now I think the greater gain is to be had by
finishing this issue #3156 now and then moving on to the WC problem when
we can. At least the WC problem will be readily visible then. (If that
turns out to be both a serious regression and difficult to fix, we can
always revert this fix as a last resort.)

Any thoughts? If no objections, I'll merge it in a couple of days.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-03 14:49:09 CEST