You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2019/01/29 12:03:38 UTC
svn commit: r1852436 - in /subversion/trunk/subversion:
libsvn_wc/update_editor.c tests/cmdline/switch_tests.py
tests/cmdline/update_tests.py
Author: stsp
Date: Tue Jan 29 12:03:38 2019
New Revision: 1852436
URL: http://svn.apache.org/viewvc?rev=1852436&view=rev
Log:
Make 'svn update' not record a tree conflict when deleting an unmodified
directory which happens to contain unversioned items. Instead, just leave
the unversioned items behind on disk when deleting the unmodified directory,
which matches the behaviour of Subversion 1.8.
Prompted by a question on users@:
https://svn.haxx.se/users/archive-2019-01/0060.shtml
* subversion/libsvn_wc/update_editor.c
(check_tree_conflict): Ignore unversioned items during check for local mods.
This prevents a tree conflict from being recorded.
* subversion/tests/cmdline/switch_tests.py
(tolerate_local_mods): Don't expect an unversioned item to cause a tree
conflict. Add the item to version control instead to meet this test's
expectations.
* subversion/tests/cmdline/update_tests.py
(update_keeps_unversioned_items_in_deleted_dir, test_list): New test
which ensures that update will leave unversioned items on disk when
deleting an unmodified directory.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1852436&r1=1852435&r2=1852436&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Jan 29 12:03:38 2019
@@ -1458,7 +1458,7 @@ check_tree_conflict(svn_skel_t **pconfli
* Therefore, we need to start a separate crawl here. */
SVN_ERR(svn_wc__node_has_local_mods(&modified, NULL,
- eb->db, local_abspath, FALSE,
+ eb->db, local_abspath, TRUE,
eb->cancel_func, eb->cancel_baton,
scratch_pool));
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1852436&r1=1852435&r2=1852436&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Tue Jan 29 12:03:38 2019
@@ -2027,8 +2027,9 @@ def tolerate_local_mods(sbox):
svntest.main.run_svn(None, 'add', L_path)
sbox.simple_commit(message='Commit added folder')
- # locally modified unversioned file
+ # locally modified versioned file
svntest.main.file_write(LM_path, 'Locally modified file.\n', 'w+')
+ sbox.simple_add('A/L/local_mod')
expected_output = svntest.wc.State(wc_dir, {
'A/L' : Item(status=' ', treeconflict='C'),
@@ -2044,7 +2045,8 @@ def tolerate_local_mods(sbox):
expected_status.tweak('', 'iota', wc_rev=1)
expected_status.tweak('A', switched='S')
expected_status.add({
- 'A/L' : Item(status='A ', copied='+', treeconflict='C', wc_rev='-')
+ 'A/L' : Item(status='A ', copied='+', treeconflict='C', wc_rev='-'),
+ 'A/L/local_mod' : Item(status='A ', wc_rev='-'),
})
# Used to fail with locally modified or unversioned files
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1852436&r1=1852435&r2=1852436&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Tue Jan 29 12:03:38 2019
@@ -6855,6 +6855,48 @@ def update_add_missing_local_add(sbox):
sbox.simple_update()
+# Verify that deleting an unmodified directory leaves behind any unversioned
+# items on disk
+def update_keeps_unversioned_items_in_deleted_dir(sbox):
+ "update keeps unversioned items in deleted dir"
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_rm('A/D/G')
+ sbox.simple_commit()
+
+ sbox.simple_update('', revision='1')
+
+ os.mkdir(sbox.ospath('A/D/G/unversioned-dir'))
+ svntest.main.file_write(sbox.ospath('A/D/G/unversioned.txt'),
+ 'unversioned file', 'wb')
+
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/D/G' : Item(status='D '),
+ })
+
+ expected_disk = svntest.main.greek_state.copy()
+ # The unversioned items should be left behind on disk
+ expected_disk.add({
+ 'A/D/G/unversioned-dir' : Item(),
+ 'A/D/G/unversioned.txt' : Item('unversioned file'),
+ })
+ expected_disk.remove('A/D/G/pi')
+ expected_disk.remove('A/D/G/rho')
+ expected_disk.remove('A/D/G/tau')
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status.remove('A/D/G')
+ expected_status.remove('A/D/G/pi')
+ expected_status.remove('A/D/G/rho')
+ expected_status.remove('A/D/G/tau')
+
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ [], True)
+
#######################################################################
# Run the tests
@@ -6946,6 +6988,7 @@ test_list = [ None,
missing_tmp_update,
update_delete_switched,
update_add_missing_local_add,
+ update_keeps_unversioned_items_in_deleted_dir,
]
if __name__ == '__main__':