On Jun 7, 2011, at 2:02 , Bert Huijben wrote: [...]
>>> 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. > (and a rename) > >> >> I think you need to find a better way to fix this very specific issue. > > Can you please revert this change until we have a better fix, to fix the > renaming issue? I reverted that revision except for the test changes (now XFAIL). I'll try again with a quick hack in the spirit of r1061328. Steve -- Stephen Butler | Senior Consultant elego Software Solutions GmbH Gustav-Meyer-Allee 25 | 13355 Berlin | Germany tel: +49 30 2345 8696 | mobile: +49 163 25 45 015 fax: +49 30 2345 8695 | http://www.elegosoft.com Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
