Checkout
Philip Martin
committed
on 09 Jun 11
Fix issue 3820, replacing a file with a directory clears any changelist.

* subversion/libsvn_wc/wc_db.c
(insert_working_node): Remove any… Show more
Fix issue 3820, replacing a file with a directory clears any changelist.

* subversion/libsvn_wc/wc_db.c

 (insert_working_node): Remove any changelist for directories.

* subversion/libsvn_wc/adm_ops.c

 (add_from_disk): Don't remove changelist.

* subversion/libsvn_wc/wc-queries.sql

 (STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST): New.

* subversion/tests/cmdline/changelist_tests.py

 (change_to_dir): Remove XFAIL, restore changelist before testing

  that merge removes it.

Show less