Re: svn commit: r12369 - in branches/1.1.x: . subversion/include subversion/libsvn_wc subversion/tests/clients/cmdline

On Sat, Dec 18, 2004 at 09:39:16AM -0600, jszakmeister@tigris.org wrote:
> Author: jszakmeister
> Date: Sat Dec 18 09:39:16 2004
> New Revision: 12369
>
> Modified:
> branches/1.1.x/STATUS
> branches/1.1.x/subversion/include/svn_wc.h
> branches/1.1.x/subversion/libsvn_wc/adm_files.c
> branches/1.1.x/subversion/tests/clients/cmdline/merge_tests.py
> Log:
> Merge r12117: Fix merges that replace directories.
>
> Approved by:
> +1: breser, kfogel, jszakmeister

I'm going to revert this change before we release 1.1.2 tomorrow. While
this does fix this it exposes a revert bug that can't be fixed on 1.1.x
because it requires wc format changes. Ultimately the changes that this
allows to be applied can not be reverted.

While technically you can already apply them by merging the delete and
the add separately, I don't think many people are doing this. So I'd
rather have things error out than have revert fail.

How revert fails in this case is it appears to have worked, but reverts
to the replaced version not the original version. This means changes
won't be reflected properly. Fortunately, the wc is left in an
uncommitable state so it's not possible to screw up the repo with this.

Basically, I'd rather have us fail for the time being in a way that's
recoverable than appear to work and fail in a way that's difficult to
recover from or even know that we've failed.

-- 
Ben Reser <ben@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org