RE: svn commit: r1132834 - in /subversion/trunk/subversion: libsvn_client/copy.c libsvn_wc/adm_ops.c tests/cmdline/copy_tests.py

> -----Original Message-----
> From: sbutler_at_apache.org [mailto:sbutler_at_apache.org]
> Sent: dinsdag 7 juni 2011 1:27
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1132834 - in /subversion/trunk/subversion:
> libsvn_client/copy.c libsvn_wc/adm_ops.c tests/cmdline/copy_tests.py
>
> Author: sbutler
> Date: Mon Jun 6 23:27:06 2011
> New Revision: 1132834
>
> URL: http://svn.apache.org/viewvc?rev=1132834&view=rev
> Log:
> Fix the move command for issue 3899 (auto resolve for wc-wc
> copies/moves).
>
> * subversion/tests/cmdline/copy_tests.py
> (copying_conflicts): Rename to...
> (copy_and_move_conflicts): ...this and add test cases for moves.
>
> * subversion/libsvn_client/copy.c
> (do_wc_to_wc_moves_with_locks2): Let svn_wc_copy3() copy the items
> and
> let svn_wc_delete4() delete them. This reverts r1061328.
>
> * subversion/libsvn_wc/adm_ops.c
> (attempt_deletion): New function.
> (svn_wc_delete4): If a file has unresolved text or property conflicts,
> delete conflict marker files.

This breaks case only renames on case insensitive filesystems and makes svn move *much* *much* *much* slower, by making a copy of everything from what used to be a simple administrative change.

I think you need to find a better way to fix this very specific issue.

        Bert
Received on 2011-06-07 01:59:49 CEST