Checkout
philip
committed
on 07 Nov 12
Fix issue 4091, symlink-ness change causes spurious tree-conflict.

* subversion/libsvn_wc/update_editor.c
(close_file): Only flag symlink… Show more
Fix issue 4091, symlink-ness change causes spurious tree-conflict.

* subversion/libsvn_wc/update_editor.c

 (close_file): Only flag symlink-ness conflict if locally modified.

* subversion/libsvn_wc/wc_db_wcroot.c

 (svn_wc__db_wcroot_parse_local_abspath): Only close db if really opened.

* subversion/tests/cmdline/special_tests.py

 (replace_symlinks): Deepcopy the r2 status for later use, remove XFAIL.

Show less