Danil Shopyrin <danil.shopyrin@gmail.com>


r32790 | danielsh | 2008-08-28 09:37:28 -0500 (Thu, 28 Aug 2008)

Fix issue #2505: make switch continue after deleting locally modified
directories, as it update and merge do.

Patch by: Danil Shopyrin <danil.shopyrin@gmail.com>
(Log message tweaked by me.)

* subversion/libsvn_wc/update_editor.c
  (leftmod_error_chain): Trap and ignore SVN_ERR_WC_LEFT_LOCAL_MOD, fixing
    a potential error leak.  Don't delete logfile in that case.
  (do_entry_deletion): Call svn_wc_remove_from_revision_control()
    with instant_error = FALSE.

* subversion/tests/cmdline/switch_tests.py
  (tolerate_local_mods): New test.
  (test_list): Run the new test.