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:40:06 UTC
svn commit: r1863309 - in /subversion/branches/1.9.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:40:06 2019
New Revision: 1863309
URL: http://svn.apache.org/viewvc?rev=1863309&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.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c
subversion/branches/1.9.x/subversion/tests/cmdline/switch_tests.py
subversion/branches/1.9.x/subversion/tests/cmdline/update_tests.py
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 18 13:40:06 2019
@@ -115,4 +115,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663609,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666067,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667738,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,166
9746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,
1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1696722,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,17053
28,1705843,1706241,1706323-1706324,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,1720643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,1748514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1758207,1758209,1758224,1758269,1758385,1758781,1759116-1759124,1759686,1760570,1761334,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,17
66704,1766711,1767768,1769152,1769456,1769973,1770677,1774109,1776742,1776783,1776788,1777103,1779948,1781507,1781655,1783214,1783704,1785053,1785734,1785737-1785738,1785754,1786445-1786447,1786515,1794166,1794611,1795087,1795116,1796158,1796420,1796720,1800619,1800754-1800755,1800803,1801705,1801722,1802032,1802080,1802316,1803825,1804013,1804691-1804692,1804695,1804714,1808955-1808956,1809558,1809564,1811189,1811786,1813771,1813783,1813789,1813794,1813802,1813898,1816365,1817856,1818584,1820518,1820718,1823202-1823203,1823327,1826720-1826721,1827191,1827574,1830883,1830900-1830901,1833465,1837037,1838813,1843888,1844882,1844987,1845204,1845212,1845408,1846403,1846406,1847572,1847596,1850348,1850651,1852013,1853761
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,1663286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663609,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665873,1665886,1665894,1665896,1666067,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667738,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,166
9746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,
1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1696722,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,1703544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,17053
28,1705843,1706241,1706323-1706324,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,1717154,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,1720643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,1741071-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,1748514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1758207,1758209,1758224,1758269,1758385,1758781,1759116-1759124,1759686,1760570,1761334,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,17
66704,1766711,1767768,1769152,1769456,1769973,1770677,1774109,1776742,1776783,1776788,1777103,1779948,1781507,1781655,1783214,1783704,1785053,1785734,1785737-1785738,1785754,1786445-1786447,1786515,1794166,1794611,1795087,1795116,1796158,1796420,1796720,1800619,1800754-1800755,1800803,1801705,1801722,1802032,1802080,1802316,1803825,1804013,1804691-1804692,1804695,1804714,1808955-1808956,1809558,1809564,1811189,1811786,1813771,1813783,1813789,1813794,1813802,1813898,1816365,1817856,1818584,1820518,1820718,1823202-1823203,1823327,1826720-1826721,1827191,1827574,1830883,1830900-1830901,1833465,1837037,1838813,1843888,1844882,1844987,1845204,1845212,1845408,1846403,1846406,1847572,1847596,1850348,1850651,1852013,1852436,1853761
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1863309&r1=1863308&r2=1863309&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Jul 18 13:40:06 2019
@@ -50,17 +50,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
-
* r1857391
Fix build with APR 1.7.0.
Justification:
Modified: subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c?rev=1863309&r1=1863308&r2=1863309&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_wc/update_editor.c Thu Jul 18 13:40:06 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.9.x/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/tests/cmdline/switch_tests.py?rev=1863309&r1=1863308&r2=1863309&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/branches/1.9.x/subversion/tests/cmdline/switch_tests.py Thu Jul 18 13:40:06 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.9.x/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/tests/cmdline/update_tests.py?rev=1863309&r1=1863308&r2=1863309&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/branches/1.9.x/subversion/tests/cmdline/update_tests.py Thu Jul 18 13:40:06 2019
@@ -6790,6 +6790,48 @@ def update_delete_switched(sbox):
svntest.actions.run_and_verify_update(wc_dir, None, None, expected_status,
[], False, sbox.ospath('A'), '-r', 0)
+# 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
@@ -6879,6 +6921,7 @@ test_list = [ None,
update_add_conflicted_deep,
missing_tmp_update,
update_delete_switched,
+ update_keeps_unversioned_items_in_deleted_dir,
]
if __name__ == '__main__':