You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/10/03 15:50:00 UTC
svn commit: r1706585 - in /subversion/branches/1.9.x-patch-fixes: ./
subversion/libsvn_client/patch.c subversion/tests/cmdline/patch_tests.py
Author: rhuijben
Date: Sat Oct 3 13:49:59 2015
New Revision: 1706585
URL: http://svn.apache.org/viewvc?rev=1706585&view=rev
Log:
On the patch fixes branch: Merge r1706091,1706221,1706222,1706401,1706403,1706415.
Modified:
subversion/branches/1.9.x-patch-fixes/ (props changed)
subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c
subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py
Propchange: subversion/branches/1.9.x-patch-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 3 13:49:59 2015
@@ -94,4 +94,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,1663338,1663347,1663355,1663374,1663450,1663530,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,1665886,1665894,1665896,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,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,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,1682472,1682714,1682854,1683071,1683126,1683135,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,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694026,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,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,1703675,1703740,1704635,1704648,1704854,1704883,1704888,1705038,1705079-1705080,1705102,1705121,1705328,1705692,1705698,1705710,1705733,1705856,1705869,1705872,1706005,1706020,1706213,1706217,1706493
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,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,1665886,1665894,1665896,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,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,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,1682472,1682714,1682854,1683071,1683126,1683135,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,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694026,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,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,1703675,1703740,1704635,1704648,1704854,1704883,1704888,1705038,1705079-1705080,1705102,1705121,1705328,1705692,1705698,1705710,1705733,1705856,1705869,1705872,1706005,1706020,1706091,1706213,1706217,1706221-1706222,1706401,1706403,1706415,1706493
Modified: subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c?rev=1706585&r1=1706584&r2=1706585&view=diff
==============================================================================
--- subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c (original)
+++ subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c Sat Oct 3 13:49:59 2015
@@ -539,6 +539,9 @@ resolve_target_path(patch_target_t *targ
target->locally_deleted = TRUE;
}
+ if (status->text_status != svn_wc_status_normal)
+ target->local_mods = TRUE;
+
if (status && (status->kind != svn_node_unknown))
target->db_kind = status->kind;
else
@@ -584,6 +587,22 @@ resolve_target_path(patch_target_t *targ
}
}
+#ifndef HAVE_SYMLINK
+ if (target->kind_on_disk == svn_node_file
+ && !target->is_symlink
+ && !target->locally_deleted
+ && status->prop_status != svn_wc_status_none)
+ {
+ const svn_string_t *value;
+
+ SVN_ERR(svn_wc_prop_get2(&value, wc_ctx, target->local_abspath,
+ SVN_PROP_SPECIAL, scratch_pool, scratch_pool));
+
+ if (value)
+ target->is_symlink = TRUE;
+ }
+#endif
+
return SVN_NO_ERROR;
}
@@ -1071,9 +1090,6 @@ init_patch_target(patch_target_t **patch
SVN_ERR(svn_io_file_open(&target->file, target->local_abspath,
APR_READ | APR_BUFFERED,
APR_OS_DEFAULT, result_pool));
- SVN_ERR(svn_wc_text_modified_p2(&target->local_mods, wc_ctx,
- target->local_abspath, FALSE,
- scratch_pool));
SVN_ERR(svn_io_is_file_executable(&target->executable,
target->local_abspath,
scratch_pool));
@@ -2541,6 +2557,13 @@ apply_one_patch(patch_target_t **patch_t
else
working_file.size = 0;
+ if (patch->operation == svn_diff_op_deleted
+ && target->had_rejects)
+ {
+ /* No match -> No delete! */
+ target->deleted = FALSE;
+ }
+
if (patched_file.size == 0 && working_file.size > 0)
{
/* If a unidiff removes all lines from a file, that usually
Modified: subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py?rev=1706585&r1=1706584&r2=1706585&view=diff
==============================================================================
--- subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py Sat Oct 3 13:49:59 2015
@@ -3425,7 +3425,6 @@ def patch_set_prop_no_eol(sbox):
return patch_one_property(sbox, False)
# Regression test for issue #3697
-@SkipUnless(svntest.main.is_posix_os)
@Issue(3697)
def patch_add_symlink(sbox):
"patch that adds a symlink"
@@ -3444,23 +3443,27 @@ def patch_add_symlink(sbox):
"+++ iota_symlink\t(working copy)\n",
"@@ -0,0 +1 @@\n",
"+link iota\n",
+ "\\ No newline at end of file\n"
"\n",
"Property changes on: iota_symlink\n",
"-------------------------------------------------------------------\n",
"Added: svn:special\n",
"## -0,0 +1 ##\n",
"+*\n",
+ "\\ No newline at end of property\n"
]
svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
- expected_output = [
- 'A %s\n' % sbox.ospath('iota_symlink'),
- ]
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota_symlink' : Item(status='A ')
+ })
expected_disk = svntest.main.greek_state.copy()
expected_disk.add({'iota_symlink': Item(contents="This is the file 'iota'.\n",
props={'svn:special' : '*'})})
+ if not svntest.main.is_posix_os():
+ expected_disk.tweak('iota_symlink', contents='link iota')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({'iota_symlink': Item(status='A ', wc_rev='0')})
@@ -3471,9 +3474,38 @@ def patch_add_symlink(sbox):
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
+
+ # And again
+ expected_output.tweak('iota_symlink', status='GG')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
+
+ # Reverse
+ expected_output.tweak('iota_symlink', status='D ')
+ expected_disk.remove('iota_symlink')
+ expected_status.remove('iota_symlink')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # And again
+ expected_output.tweak('iota_symlink', status='GG')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
def patch_moved_away(sbox):
"patch a file that was moved away"
@@ -6176,11 +6208,20 @@ def patch_git_symlink(sbox):
expected_status, expected_skip,
[], True, True)
- # And again
- # svntest.actions.run_and_verify_patch(wc_dir, to_file_patch,
- # expected_output, expected_disk,
- # expected_status, expected_skip,
- # [], True, True)
+ # And again - Delete can't be applied
+ expected_output.tweak('link-to-iota', status='G ', prev_status='C ')
+ expected_disk.add({
+ 'link-to-iota.svnpatch.rej': Item(
+ contents='--- link-to-iota\n'
+ '+++ link-to-iota\n'
+ '@@ -1,1 +0,0 @@\n'
+ '-A/mu\n'
+ '\\ No newline at end of file\n'),
+ })
+ svntest.actions.run_and_verify_patch(wc_dir, to_file_patch,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True)
########################################################################
#Run the tests