Checkout
sbutler
committed
on 06 Jun 11
Fix the move command for issue 3899 (auto resolve for wc-wc copies/moves).

* subversion/tests/cmdline/copy_tests.py
(copying_conflicts): … Show more
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.

Show less