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 2016/02/21 14:16:22 UTC
svn commit: r1731527 -
/subversion/trunk/subversion/tests/cmdline/patch_tests.py
Author: rhuijben
Date: Sun Feb 21 13:16:22 2016
New Revision: 1731527
URL: http://svn.apache.org/viewvc?rev=1731527&view=rev
Log:
* subversion/tests/cmdline/patch_tests.py
(patch_merge): Add 2-url merge to testcase added in r1731525.
Modified:
subversion/trunk/subversion/tests/cmdline/patch_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1731527&r1=1731526&r2=1731527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Sun Feb 21 13:16:22 2016
@@ -7684,6 +7684,7 @@ def patch_merge(sbox):
sbox.build()
wc_dir = sbox.wc_dir
+ repo_url = sbox.repo_url
sbox.simple_add_text('A\n'
'B\n'
@@ -7754,13 +7755,26 @@ def patch_merge(sbox):
'J\n'
'K\n'
'L')})
- expected_output = wc.State(wc_dir, {
- 'new.txt' : Item(status='G '),
- })
-
+ expected_output.tweak('new.txt', status='G ')
svntest.actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
None, [])
+ # Revert to base position
+ sbox.simple_revert('new.txt')
+ sbox.simple_update(revision=2)
+
+ # And now do the same thing as a merge instead of an update
+ expected_output.tweak('new.txt', status='U ')
+ svntest.actions.run_and_verify_patch(wc_dir, local_patch,
+ expected_output, None,
+ None, expected_skip)
+
+ expected_output.tweak('new.txt', status='G ')
+ svntest.actions.run_and_verify_merge(wc_dir, 2, 3, repo_url, repo_url,
+ expected_output, None, None,
+ expected_disk, None,
+ expected_skip)
+
########################################################################
#Run the tests