You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2019/07/18 13:37:51 UTC
svn commit: r1863296 - in /subversion/branches/1.10.x: ./ STATUS
subversion/libsvn_wc/update_editor.c subversion/tests/cmdline/switch_tests.py
subversion/tests/cmdline/update_tests.py
Author: julianfoad
Date: Thu Jul 18 13:37:51 2019
New Revision: 1863296
URL: http://svn.apache.org/viewvc?rev=1863296&view=rev
Log:
Merge r1852436 from trunk:
* r1852436
Make 'svn update' not record a tree conflict when deleting an unmodified
directory which happens to contain unversioned items.
Justification:
Unnecessary tree conflict due to e.g. build artifacts on disk.
User complained: https://svn.haxx.se/users/archive-2019-01/0060.shtml
IRC discussion:
https://colabti.org/irclogger/irclogger_log/svn-dev?date=2019-01-29#l10
Votes:
+1: stsp
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_wc/update_editor.c
subversion/branches/1.10.x/subversion/tests/cmdline/switch_tests.py
subversion/branches/1.10.x/subversion/tests/cmdline/update_tests.py
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 18 13:37:51 2019
@@ -103,4 +103,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264,184
3888,1844882,1844987,1845204,1845212,1845261,1845408,1845555,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1850651,1851676,1851687,1851791,1851920,1852013,1853761,1863262
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825024,1825045,1825215,1825266,1825306,1825709,1825711,1825721,1825736,1825778,1825783,1825787-1825788,1825979,1826720-1826721,1826747,1826811,1826814,1826877,1826907,1826971,1827105,1827114,1827191,1827562,1827574,1827670,1828613,1829012,1829015,1829241,1829260,1829344,1830083,1830882-1830883,1830885,1830900-1830901,1831110,1831112,1831540,1833465,1833621,1833836,1833842,1833864,1833866,1833895,1833897,1833899,1833901,1835760,1836306,1836762,1836802,1836960,1836963,1836968,1836976,1837037,1837790,1838813,1839662,1839703,1839734,1839739,1840991,1842260,1842262,1842264,184
3888,1844882,1844987,1845204,1845212,1845261,1845408,1845555,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847572,1847596,1847598,1847697,1847922,1847924,1847946,1850348,1850621,1850651,1851676,1851687,1851791,1851920,1852013,1852436,1853761,1863262
Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1863296&r1=1863295&r2=1863296&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Jul 18 13:37:51 2019
@@ -21,17 +21,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1852436
- Make 'svn update' not record a tree conflict when deleting an unmodified
- directory which happens to contain unversioned items.
- Justification:
- Unnecessary tree conflict due to e.g. build artifacts on disk.
- User complained: https://svn.haxx.se/users/archive-2019-01/0060.shtml
- IRC discussion:
- https://colabti.org/irclogger/irclogger_log/svn-dev?date=2019-01-29#l10
- Votes:
- +1: stsp
-
* r1853450
Enable 'incoming_move_file_merge' option only if local change is file edit.
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_wc/update_editor.c?rev=1863296&r1=1863295&r2=1863296&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_wc/update_editor.c Thu Jul 18 13:37:51 2019
@@ -1454,7 +1454,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/branches/1.10.x/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/switch_tests.py?rev=1863296&r1=1863295&r2=1863296&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/switch_tests.py Thu Jul 18 13:37:51 2019
@@ -2029,8 +2029,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'),
@@ -2046,7 +2047,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/branches/1.10.x/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/cmdline/update_tests.py?rev=1863296&r1=1863295&r2=1863296&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/branches/1.10.x/subversion/tests/cmdline/update_tests.py Thu Jul 18 13:37:51 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__':