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/02/27 19:57:58 UTC
svn commit: r1662794 [3/4] - in /subversion/trunk/subversion/tests/cmdline:
./ svntest/
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Feb 27 18:57:57 2015
@@ -154,9 +154,7 @@ def textual_merges_galore(sbox):
# Initial commit.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Make the "other" working copy
other_wc = sbox.add_wc_path('other')
@@ -190,9 +188,7 @@ def textual_merges_galore(sbox):
# Commit revision 3.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Make local mods in wc.other
other_pi_path = os.path.join(other_wc, 'A', 'D', 'G', 'pi')
@@ -410,9 +406,7 @@ def add_with_history(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
expected_output = wc.State(C_path, {
'Q' : Item(status='A '),
@@ -490,9 +484,7 @@ def add_with_history(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Issue 953
@@ -530,8 +522,7 @@ def simple_property_merges(sbox):
expected_status.tweak('A/B/E', 'A/B/E/alpha', 'A/B/E/beta',
wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Copy B to B2 as rev 3
@@ -570,8 +561,7 @@ def simple_property_merges(sbox):
'A/B2/lambda' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
pristine_status = expected_status
@@ -821,9 +811,7 @@ def merge_one_file_helper(sbox, arg_flav
expected_status.tweak('A/D/G/rho', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Backdate rho to revision 1, so we can merge in the rev 2 changes.
svntest.actions.run_and_verify_svn(None, [],
@@ -969,9 +957,7 @@ def merge_with_implicit_target_helper(sb
# Initial commit.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Make the "other" working copy, at r1
other_wc = sbox.add_wc_path('other')
@@ -1103,9 +1089,7 @@ def merge_with_prev(sbox):
# Initial commit.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Make some other working copies
other_wc = sbox.add_wc_path('other')
@@ -1191,8 +1175,7 @@ def merge_binary_file(sbox):
'A/theta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# Make the "other" working copy
other_wc = sbox.add_wc_path('other')
@@ -1208,8 +1191,7 @@ def merge_binary_file(sbox):
'A/theta' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# In second working copy, attempt to 'svn merge -r 2:3'.
# We should *not* see a conflict during the update, but a 'U'.
@@ -1376,9 +1358,7 @@ def merge_skips_obstructions(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
pre_merge_status = expected_status
@@ -1483,8 +1463,7 @@ def merge_skips_obstructions(sbox):
expected_status.remove('iota', 'A/D/G', 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now create unversioned iota and A/D/G, try running a merge -r2:3.
# The merge process should skip over these targets, since they're
@@ -1543,8 +1522,7 @@ def merge_skips_obstructions(sbox):
expected_status.tweak('A/B/lambda', wc_rev=4)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [], 'rm', lambda_path)
@@ -1554,8 +1532,7 @@ def merge_skips_obstructions(sbox):
expected_status.remove('A/B/lambda')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# lambda is gone, so create an unversioned lambda in its place.
# Then attempt to merge -r3:4, which is a change to lambda. The merge
@@ -1615,8 +1592,7 @@ def merge_skips_obstructions(sbox):
expected_status.tweak('', status=' ', wc_rev=6)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
os.unlink(lambda_path)
expected_output = wc.State(wc_dir, { })
@@ -1676,8 +1652,7 @@ def merge_into_missing(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
R_path = os.path.join(Q_path, 'R')
bar_path = os.path.join(R_path, 'bar')
@@ -1700,8 +1675,7 @@ def merge_into_missing(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
os.unlink(foo_path)
svntest.main.safe_rmtree(Q_path)
@@ -1821,8 +1795,7 @@ def dry_run_adds_file_with_prop(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Do a regular merge of that change into a different dir.
F_path = sbox.ospath('A/B/F')
@@ -1889,9 +1862,7 @@ def merge_binary_with_common_ancestry(sb
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None,
- wc_dir)
+ expected_output, expected_status)
# Create the first branch
J_path = sbox.ospath('J')
@@ -1908,9 +1879,7 @@ def merge_binary_with_common_ancestry(sb
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None,
- wc_dir)
+ expected_output, expected_status)
# Create the path where the files will be merged
K_path = sbox.ospath('K')
@@ -1926,9 +1895,7 @@ def merge_binary_with_common_ancestry(sb
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None,
- wc_dir)
+ expected_output, expected_status)
# Copy 'I/theta' to 'K/'. This file will be merged later.
theta_K_path = os.path.join(K_path, 'theta')
@@ -1944,9 +1911,7 @@ def merge_binary_with_common_ancestry(sb
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None,
- wc_dir)
+ expected_output, expected_status)
# Modify the original ancestry 'I/theta'
svntest.main.file_append(theta_I_path, "some extra junk")
@@ -1959,9 +1924,7 @@ def merge_binary_with_common_ancestry(sb
expected_status.tweak('I/theta', wc_rev=6)
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None,
- wc_dir)
+ expected_output, expected_status)
# Create the second branch from the modified ancestry
L_path = sbox.ospath('L')
@@ -1979,9 +1942,7 @@ def merge_binary_with_common_ancestry(sb
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None,
- wc_dir)
+ expected_output, expected_status)
# Now merge first ('J/') and second ('L/') branches into 'K/'
saved_cwd = os.getcwd()
@@ -2078,8 +2039,7 @@ def merge_funny_chars_on_path(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Do a regular merge of that change into a different dir.
F_path = sbox.ospath('A/B/F')
@@ -2138,8 +2098,7 @@ def merge_funny_chars_on_path(sbox):
svntest.actions.run_and_verify_commit(F_path,
expected_output,
- None,
- None, wc_dir)
+ None)
#-----------------------------------------------------------------------
# Regression test for issue #2064
@@ -2240,8 +2199,7 @@ def merge_prop_change_to_deleted_target(
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/E/alpha', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
svntest.actions.run_and_verify_svn(None, [],
'up', wc_dir)
@@ -2255,7 +2213,7 @@ def merge_prop_change_to_deleted_target(
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None, alpha_path)
+ [], alpha_path)
# Try merging the original propset, which applies to a target that
# no longer exists. The bug would only reproduce when run from
@@ -2316,8 +2274,7 @@ def merge_dir_replace(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Merge replacement of foo onto C
expected_output = wc.State(C_path, {
'foo' : Item(status='R '),
@@ -2378,8 +2335,7 @@ def merge_dir_replace(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# A merge that replaces a directory and one of its children
@@ -2426,8 +2382,7 @@ def merge_dir_and_file_replace(sbox):
expected_status.tweak('A/C', wc_rev=3) # From mergeinfo
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Merge replacement of foo onto C
expected_output = wc.State(C_path, {
'foo' : Item(status='R '),
@@ -2488,8 +2443,7 @@ def merge_dir_and_file_replace(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Confirm the files are present in the repository.
new_file_2_url = sbox.repo_url + '/A/C/foo/new file 2'
@@ -2560,8 +2514,7 @@ def merge_dir_branches(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create an unversioned foo
foo_path = sbox.ospath('foo')
@@ -2618,8 +2571,7 @@ def safe_property_merge(sbox):
expected_status.tweak('A/B/E', 'A/B/E/alpha', 'A/B/E/beta',
wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Copy B to B2 as rev 3 (making a branch)
@@ -2647,8 +2599,7 @@ def safe_property_merge(sbox):
'A/B/E/beta' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, None,
- None, wc_dir)
+ expected_output, None)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Make local propchanges to E, alpha and beta in the branch.
@@ -2746,8 +2697,7 @@ def property_merge_from_branch(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/E', 'A/B/E/alpha', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Copy B to B2 as rev 3 (making a branch)
@@ -2771,8 +2721,7 @@ def property_merge_from_branch(sbox):
'A/B/E/alpha' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, None,
- None, wc_dir)
+ expected_output, None)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Make different propchanges changes to the B2 branch and commit as r5.
@@ -2790,8 +2739,7 @@ def property_merge_from_branch(sbox):
'A/B2/E/alpha' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, None,
- None, wc_dir)
+ expected_output, None)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Now merge the recent B change to the branch. There are no local
@@ -2870,8 +2818,7 @@ def property_merge_undo_redo(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/E/alpha', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# Use 'svn merge' to undo the commit. ('svn merge -r2:1')
@@ -3074,8 +3021,7 @@ def merge_file_replace(sbox):
# Commit rev 2
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Create and add a new file.
svntest.main.file_write(rho_path, "new rho\n")
svntest.actions.run_and_verify_svn(None, [], 'add', rho_path)
@@ -3091,8 +3037,7 @@ def merge_file_replace(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None, wc_dir)
+ None)
# Update working copy
expected_output = svntest.wc.State(wc_dir, {})
@@ -3135,9 +3080,7 @@ def merge_file_replace(sbox):
expected_status.tweak('A/D/G/rho', status=' ', copied=None, wc_rev='4')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Test for issue 2522
@@ -3166,8 +3109,7 @@ def merge_file_replace_to_mixed_rev_wc(s
# Commit rev 2
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Update working copy
expected_disk = svntest.main.greek_state.copy()
@@ -3199,8 +3141,7 @@ def merge_file_replace_to_mixed_rev_wc(s
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# merge changes from r3:1...
#
@@ -3252,9 +3193,7 @@ def merge_file_replace_to_mixed_rev_wc(s
expected_status.tweak('A/D/G/rho', status=' ', copied=None, wc_rev='4')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# use -x -w option for ignoring whitespace during merge
@@ -3277,8 +3216,7 @@ def merge_ignore_whitespace(sbox):
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
# change the file, mostly whitespace changes + an extra line
svntest.main.file_write(file_path, "A a\nBb \n Cc\nNew line in iota\n")
@@ -3287,9 +3225,7 @@ def merge_ignore_whitespace(sbox):
expected_status.tweak(file_name, wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Backdate iota to revision 2, so we can merge in the rev 3 changes.
svntest.actions.run_and_verify_svn(None, [],
@@ -3351,8 +3287,7 @@ def merge_ignore_eolstyle(sbox):
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
# change the file, mostly eol changes + an extra line
svntest.main.file_write(file_path,
@@ -3366,9 +3301,7 @@ def merge_ignore_eolstyle(sbox):
expected_status.tweak(file_name, wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Backdate iota to revision 2, so we can merge in the rev 3 changes.
svntest.actions.run_and_verify_svn(None, [],
@@ -3471,8 +3404,7 @@ def merge_conflict_markers_matching_eol(
# Commit the original change and note the 'base' revision number
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
cur_rev = cur_rev + 1
base_rev = cur_rev
@@ -3704,8 +3636,7 @@ def create_deep_trees(wc_dir):
'A/B/F/E/beta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
svntest.main.run_svn(None, 'cp', A_B_F_E_path, A_B_F_E1_path)
@@ -3719,8 +3650,7 @@ def create_deep_trees(wc_dir):
'A/B/F/E1/beta' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# Bring the entire WC up to date with rev 3.
svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
@@ -3744,8 +3674,7 @@ def create_deep_trees(wc_dir):
'A/copy-of-B/lambda' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
expected_disk = svntest.main.greek_state.copy()
expected_disk.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
@@ -3803,8 +3732,7 @@ def avoid_repeated_merge_using_inherited
})
expected_status.tweak('A/B/F/E/alpha', wc_rev=5)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# Bring the entire WC up to date with rev 5.
svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
@@ -3862,7 +3790,7 @@ def avoid_repeated_merge_using_inherited
'F/E/alpha' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(copy_of_B_path, expected_output,
- None, None, wc_dir)
+ None)
# Update the WC to bring /A/copy_of_B/F from rev 4 to rev 6.
# Without this update, a subsequent merge will not find any merge
@@ -3926,7 +3854,7 @@ def avoid_repeated_merge_on_subtree_with
})
expected_status.tweak('A/B/F/E/alpha', wc_rev=5)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
for path_and_mergeinfo in (('E', '/A/B/F/E:5'),
('E1', '/A/B/F/E:5')):
@@ -3972,7 +3900,7 @@ def avoid_repeated_merge_on_subtree_with
'alpha' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(path_name,
- expected_output, None, None, wc_dir)
+ expected_output, None, [], wc_dir)
# Edit A/B/F/E/alpha and commit it, creating revision 8.
new_content_for_alpha = 'new content to alpha\none more line\n'
@@ -3987,7 +3915,7 @@ def avoid_repeated_merge_on_subtree_with
'beta' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_commit(A_B_F_E_path, expected_output,
- expected_status, None, wc_dir)
+ expected_status, [], wc_dir)
# Update the WC to bring /A/copy_of_B to rev 8.
# Without this update expected_status tree would be cumbersome to
@@ -4124,7 +4052,7 @@ def tweak_src_then_merge_to_dest(sbox, s
{ '': Item(wc_rev=new_rev, status=' ')})
svntest.actions.run_and_verify_commit(src_path, expected_output,
- expected_status, None, src_path)
+ expected_status)
# Update the WC to new_rev so that it would be easier to expect everyone
# to be at new_rev.
@@ -4187,7 +4115,7 @@ def obey_reporter_api_semantics_while_do
'A/copy-of-D/gamma' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
cur_rev = 2
@@ -4573,9 +4501,7 @@ def mergeinfo_inheritance(sbox):
wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None,
- wc_dir)
+ wc_status)
# In single-db mode you can't create a disconnected working copy by just
# copying a subdir
@@ -4681,9 +4607,7 @@ def mergeinfo_elision(sbox):
wc_status.tweak('A_COPY/B/E/beta', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None,
- wc_dir)
+ wc_status)
# Update A_COPY to get all paths to the same working revision.
svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [],
@@ -4986,7 +4910,7 @@ def mergeinfo_inheritance_and_discontinu
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
None,
- None,
+ [],
mu_copy_path)
# ...and that the presence of the property is retained, even when
# the value has been wiped.
@@ -5117,16 +5041,14 @@ def merge_to_switched_path(sbox):
"A/D/G_COPY/tau" : Item(status=' ', wc_rev=7),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# r8 - modify and commit A/D/G_COPY/rho
svntest.main.file_write(sbox.ospath('A/D/G_COPY/rho'),
"New *and* improved rho content")
expected_output = wc.State(wc_dir, {'A/D/G_COPY/rho' : Item(verb='Sending')})
wc_status.tweak('A/D/G_COPY/rho', wc_rev=8)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Switch A_COPY/D/G to A/D/G.
wc_disk.add({
@@ -5528,8 +5450,7 @@ def merge_to_path_with_switched_children
wc_status.tweak('A_COPY', 'A_COPY/B/E/beta', 'A_COPY/D', 'A_COPY/D/G',
'A_COPY/D/G/rho', 'A_COPY/D/H', 'A_COPY/D/H/omega',
'A_COPY/D/H/psi', wc_rev=9)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Unswitch A_COPY/D/H/psi.
expected_output = svntest.wc.State(wc_dir, {
@@ -5620,8 +5541,7 @@ def merge_to_path_with_switched_children
})
wc_status.tweak('A_COPY/D', wc_rev=9)
wc_status.tweak('A/D', 'A_COPY/D/H', 'A_COPY/D/H/psi', wc_rev=10)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
expected_output = wc.State(A_COPY_D_path, {
'' : Item(status=' U')
})
@@ -5785,7 +5705,7 @@ def merge_with_implicit_target_file(sbox
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Update to revision 2.
svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
@@ -5980,9 +5900,7 @@ def prop_add_to_child_with_mergeinfo(sbo
{'A/B/E/beta' : Item(verb='Sending')})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Merge r4:5 from A/B/E/beta into A_COPY/B/E/beta.
svntest.actions.run_and_verify_svn(
@@ -6125,7 +6043,7 @@ def foreign_repos_does_not_update_mergei
'A_COPY/nu' : Item(verb='Adding'), # Has empty mergeinfo
})
svntest.actions.run_and_verify_commit(other_wc_dir, expected_output,
- None, None, other_wc_dir,
+ None, [], other_wc_dir,
'-m',
'create mergeinfo on foreign repos')
# Now merge a diff from the foreign repos that contains the mergeinfo
@@ -6187,7 +6105,7 @@ def avoid_reflected_revs(sbox):
expected_output = wc.State(wc_dir, {'A/tfile1' : Item(verb='Adding')})
wc_status.add({'A/tfile1' : Item(status=' ', wc_rev=3)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r4 - Create a bfile1 in A_COPY
svntest.main.file_write(bfile1_path, bfile1_content)
@@ -6195,7 +6113,7 @@ def avoid_reflected_revs(sbox):
expected_output = wc.State(wc_dir, {'A_COPY/bfile1' : Item(verb='Adding')})
wc_status.add({'A_COPY/bfile1' : Item(status=' ', wc_rev=4)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r5 - Create one more file in A
svntest.main.file_write(tfile2_path, tfile2_content)
@@ -6203,7 +6121,7 @@ def avoid_reflected_revs(sbox):
expected_output = wc.State(wc_dir, {'A/tfile2' : Item(verb='Adding')})
wc_status.add({'A/tfile2' : Item(status=' ', wc_rev=5)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Merge r5 from /A to /A_COPY, creating r6
expected_output = wc.State(A_COPY_path, {
@@ -6280,7 +6198,7 @@ def avoid_reflected_revs(sbox):
'A_COPY/tfile2' : Item(verb='Adding'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# Merge r3 from /A to /A_COPY, creating r7
expected_output = wc.State(A_COPY_path, {
@@ -6320,7 +6238,7 @@ def avoid_reflected_revs(sbox):
'A_COPY/tfile1' : Item(verb='Adding'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# r8 - Add bfile2 to A_COPY
svntest.main.file_write(bfile2_path, bfile2_content)
@@ -6334,7 +6252,7 @@ def avoid_reflected_revs(sbox):
'A_COPY/tfile1' : Item(status=' ', wc_rev=7),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Merge 2:8 from A_COPY(feature branch) to A(trunk).
expected_output = wc.State(A_path, {
@@ -6475,9 +6393,7 @@ def update_loses_mergeinfo(sbox):
)
svntest.actions.run_and_verify_commit(A_C_wc_dir,
expected_output,
- expected_status,
- None,
- A_C_wc_dir)
+ expected_status)
other_A_C_wc_dir = os.path.join(other_wc, 'A', 'C')
expected_output = wc.State(other_A_C_wc_dir, {'K' : Item(status='A ')})
@@ -6594,9 +6510,7 @@ def merge_loses_mergeinfo(sbox):
)
svntest.actions.run_and_verify_commit(A_C_wc_dir,
expected_output,
- expected_status,
- None,
- A_C_wc_dir)
+ expected_status)
expected_output = wc.State(A_C_wc_dir, {'J' : Item(status='D ')})
expected_elision_output = wc.State(A_C_wc_dir, {
'' : Item(status=' U'),
@@ -6670,8 +6584,7 @@ def single_file_replace_style_merge_capa
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Merge the file mu alone to rev1
svntest.actions.run_and_verify_svn(expected_merge_output(None,
@@ -6741,8 +6654,7 @@ def merge_to_out_of_date_target(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None, wc_dir)
+ wc_status)
# Merge -c6 into A_COPY/D/H of other WC.
expected_output = wc.State(other_A_COPY_H_path, {
@@ -6839,9 +6751,7 @@ def merge_with_depth_files(sbox):
# Commit the modified contents
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Update working copy
svntest.actions.run_and_verify_svn(None, [],
@@ -6959,8 +6869,7 @@ def merge_away_subtrees_noninheritable_r
'A/D/H' : Item(verb='Sending'),})
wc_status.tweak(wc_rev=7)
wc_status.tweak('A/D/H', wc_rev=8)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Merge r6:8 --depth immediates to A_COPY/D. This should merge the
# prop change from r8 to A_COPY/H but not the change to A_COPY/D/H/omega
@@ -7058,8 +6967,7 @@ def merge_away_subtrees_noninheritable_r
sbox.repo_url + '/A', A_COPY_path)
wc_status.tweak('A_COPY', wc_rev=9)
expected_output = wc.State(wc_dir, {'A_COPY' : Item(verb='Sending')})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# r10: Add the file A/nu.
svntest.main.file_write(nu_path, "This is the file 'nu'.\n")
@@ -7067,7 +6975,7 @@ def merge_away_subtrees_noninheritable_r
expected_output = wc.State(wc_dir, {'A/nu' : Item(verb='Adding')})
wc_status.add({'A/nu' : Item(status=' ', wc_rev=10)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Now merge -c10 from A to A_COPY.
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -7382,7 +7290,7 @@ def merge_to_sparse_directories(sbox):
expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
wc_status.tweak('A/mu', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
wc_disk.tweak('A/mu', contents="New content")
# r8 - Add a prop to A/D and commit.
@@ -7396,8 +7304,7 @@ def merge_to_sparse_directories(sbox):
})
wc_status.tweak(wc_rev=7)
wc_status.tweak('A/D', wc_rev=8)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# r9 - Add a prop to A and commit.
svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [],
@@ -7410,8 +7317,7 @@ def merge_to_sparse_directories(sbox):
})
wc_status.tweak(wc_rev=8)
wc_status.tweak('A', wc_rev=9)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Do an --immediates checkout of A_COPY
immediates_dir = sbox.add_wc_path('immediates')
@@ -7683,8 +7589,7 @@ def merge_old_and_new_revs_from_renamed_
svntest.main.file_write(mu_path, "This is the file 'mu' modified.\n")
expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
wc_status.add({'A/mu' : Item(status=' ', wc_rev=3)})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Move A to A_MOVED
svntest.actions.run_and_verify_svn(['Committing transaction...\n',
@@ -7747,7 +7652,7 @@ def merge_old_and_new_revs_from_renamed_
'A_COPY/D/H/psi' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Merge /A_MOVED to /A_COPY - this happens in multiple passes
# because /A_MOVED has renames in its history between the boundaries
@@ -7857,7 +7762,7 @@ def merge_with_child_having_different_re
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [],
'cp', A_url, A_COPY_url, '-m', 'rev 3')
# Update the working copy to get A_COPY
@@ -7886,7 +7791,7 @@ def merge_with_child_having_different_re
svntest.main.file_write(mu_path, tweaked_7th_line)
expected_status.tweak('A/mu', wc_rev=4)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
expected_status.tweak(wc_rev=4)
tweaked_17th_line = tweaked_7th_line.replace('line17', 'LINE 17')
@@ -7901,13 +7806,13 @@ def merge_with_child_having_different_re
expected_status.tweak('A', wc_rev=5)
expected_status.tweak('A/mu', wc_rev=5)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
tweaked_27th_line = tweaked_17th_line.replace('line27', 'LINE 27')
svntest.main.file_write(mu_path, tweaked_27th_line)
expected_status.tweak('A/mu', wc_rev=6)
expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Merge r5 to A_COPY/mu
svntest.actions.run_and_verify_svn(
expected_merge_output([[5]],
@@ -8104,7 +8009,7 @@ def merge_old_and_new_revs_from_renamed_
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Move mu to mu_MOVED
svntest.actions.run_and_verify_svn(['Committing transaction...\n',
@@ -8125,7 +8030,7 @@ def merge_old_and_new_revs_from_renamed_
'A/mu_COPY' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Merge A/mu_MOVED to A/mu_COPY - this happens in multiple passes
# because A/mu_MOVED has renames in its history between the
@@ -8183,7 +8088,7 @@ def merge_with_auto_rev_range_detection(
'A/B1/mu' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Copy A to A_COPY
svntest.actions.run_and_verify_svn(['Committing transaction...\n',
@@ -8200,7 +8105,7 @@ def merge_with_auto_rev_range_detection(
'A/B1/mu' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Update the working copy to get A_COPY
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -8310,16 +8215,14 @@ def cherry_picking(sbox):
wc_status.tweak('A/D/G', wc_rev=7)
wc_disk.tweak('A/D/G', props={'prop:name' : 'propval'})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
H_path + "'\n"], [], 'ps',
'prop:name', 'propval', H_path)
expected_output = svntest.wc.State(wc_dir, {'A/D/H': Item(verb='Sending'),})
wc_status.tweak('A/D/H', wc_rev=8)
wc_disk.tweak('A/D/H', props={'prop:name' : 'propval'})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Do multiple additive merges to a file"
# Merge -r2:4 -c6 into A_COPY/D/G/rho.
@@ -8487,7 +8390,7 @@ def propchange_of_subdir_raises_conflict
'A/B/E' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Merge /A/B to /A_COPY/B ie., r1 to r3 with depth files
expected_output = wc.State(A_COPY_B_path, {
@@ -8594,8 +8497,7 @@ def reverse_merge_prop_add_on_child(sbox
wc_status.tweak('A/D/G', wc_rev=3)
wc_disk.tweak('A/D/G', props={'prop:name' : 'propval'})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Merge -c3's prop add to A_COPY/D/G
expected_output = wc.State(G_COPY_path, {
@@ -8710,7 +8612,7 @@ def merge_target_with_non_inheritable_me
'A/B/E/newfile' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Merge /A/B to /A_COPY/B ie., r1 to r3 with depth immediates
expected_output = wc.State(A_COPY_B_path, {
@@ -8820,9 +8722,7 @@ def self_reverse_merge(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# update to HEAD so that the to-be-undone revision is found in the
# implicit mergeinfo (the natural history) of the target.
@@ -8898,7 +8798,7 @@ def ignore_ancestry_and_mergeinfo(sbox):
'A/B/lambda' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -9020,8 +8920,7 @@ def merge_from_renamed_branch_fails_whil
'file1' : Item(status=' ', wc_rev=4),
})
svntest.actions.run_and_verify_commit(A_RENAMED_C_path, expected_output,
- expected_status, None,
- A_RENAMED_C_path)
+ expected_status)
svntest.main.file_write(A_RENAMED_C_file1_path,
"This is the file1 modified.\n")
expected_output = wc.State(A_RENAMED_C_path, {
@@ -9029,8 +8928,7 @@ def merge_from_renamed_branch_fails_whil
})
expected_status.tweak('file1', wc_rev=5)
svntest.actions.run_and_verify_commit(A_RENAMED_C_path, expected_output,
- expected_status, None,
- A_RENAMED_C_path)
+ expected_status)
expected_skip = wc.State(A_C_path, {})
expected_output = wc.State(A_C_path, {
@@ -9144,8 +9042,7 @@ def merge_source_normalization_and_subtr
expected_output = wc.State(wc_dir,
{'A_MOVED/D/G/tau' : Item(verb='Sending')})
wc_status.tweak('A_MOVED/D/G/tau', status=' ', wc_rev=8)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Merge -c4 URL/A_MOVED/D/G A_COPY/D/G.
#
@@ -9263,13 +9160,11 @@ def new_subtrees_should_not_break_merge(
svntest.actions.run_and_verify_svn(None, [], 'add', nu_path)
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Adding')})
wc_status.add({'A/D/H/nu' : Item(status=' ', wc_rev=7)})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
svntest.main.file_write(nu_path, "New content")
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Sending')})
wc_status.tweak('A/D/H/nu', wc_rev=8)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Merge r7 to A_COPY/D/H, then, so it has it's own explicit mergeinfo,
# then merge r8 to A_COPY/D/H/nu so it too has explicit mergeinfo.
@@ -9519,8 +9414,7 @@ def new_subtrees_should_not_break_merge(
'A_COPY/D/H/omega',
wc_rev=9)
wc_status.add({'A_COPY/D/H/nu' : Item(status=' ', wc_rev=9)})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Update the WC.
svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [],
'up', wc_dir)
@@ -9611,8 +9505,7 @@ def new_subtrees_should_not_break_merge(
expected_output = wc.State(wc_dir, {
'A_COPY/D/G/rho' : Item(verb='Sending'),})
wc_status.tweak('A_COPY/D/G/rho', wc_rev=10)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
svntest.actions.run_and_verify_svn(exp_noop_up_out(10), [],
'up', wc_dir)
wc_status.tweak(wc_rev=10)
@@ -9767,9 +9660,7 @@ def dont_add_mergeinfo_from_own_history(
wc_status.tweak('A_COPY', 'A_COPY/D/H/psi', 'A_COPY/mu', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None,
- wc_dir)
+ wc_status)
# Merge r7 back to the 'A'
expected_output = wc.State(A_path, {
@@ -10081,9 +9972,7 @@ def dont_add_mergeinfo_from_own_history(
wc_status.tweak(status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None,
- wc_dir)
+ wc_status)
expected_output = wc.State(A_path, {
'mu' : Item(status='U '),
@@ -10281,9 +10170,7 @@ def foreign_repos(sbox):
+ added_contents)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
svntest.actions.verify_disk(wc_dir, expected_disk, True)
# Now, merge our committed revision into a working copy of another
@@ -10348,9 +10235,7 @@ def foreign_repos_uuid(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
svntest.actions.verify_disk(wc_dir, expected_disk, True)
svntest.main.run_svn(None, 'merge', '-c2', sbox.repo_url, wc_dir2)
@@ -10458,9 +10343,7 @@ def foreign_repos_2_url(sbox):
+ added_contents)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
svntest.actions.verify_disk(wc_dir, expected_disk, True)
# Now, "tag" the new state of the repository.
@@ -10654,9 +10537,7 @@ def reverse_merge_away_all_mergeinfo(sbo
wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None,
- wc_dir)
+ wc_status)
# Now reverse merge r7 from itself, all mergeinfo should be removed.
expected_output = wc.State(A_COPY_H_path, {
@@ -10734,7 +10615,7 @@ def dont_merge_revs_into_subtree_that_pr
expected_output = wc.State(wc_dir, {'A/D/H/psi' : Item(verb='Sending')})
expected_status.tweak('A/D/H/psi', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_disk.tweak('A/D/H/psi', contents="New content")
# Create 'A/D/H/nu' and commit it as r3.
@@ -10743,14 +10624,14 @@ def dont_merge_revs_into_subtree_that_pr
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Adding')})
expected_status.add({'A/D/H/nu' : Item(status=' ', wc_rev=3)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Delete 'A/D/H/nu' and commit it as r4.
svntest.actions.run_and_verify_svn(None, [], 'rm', nu_path)
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Deleting')})
expected_status.remove('A/D/H/nu')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Copy 'A/D/H/nu' from r3 and commit it as r5.
svntest.actions.run_and_verify_svn(None, [], 'cp',
@@ -10758,7 +10639,7 @@ def dont_merge_revs_into_subtree_that_pr
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Adding')})
expected_status.add({'A/D/H/nu' : Item(status=' ', wc_rev=5)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Copy 'A/D/H' to 'H_COPY' in r6.
svntest.actions.run_and_verify_svn(['Committing transaction...\n',
@@ -10783,7 +10664,7 @@ def dont_merge_revs_into_subtree_that_pr
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Sending')})
expected_status.tweak('A/D/H/nu', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Remove A/D/H/nu and commit it as r8.
# We do this deletion so that following cherry harvest has a *tough*
@@ -10792,7 +10673,7 @@ def dont_merge_revs_into_subtree_that_pr
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Deleting')})
expected_status.remove('A/D/H/nu')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Make another text mod to 'A/D/H/psi' that can be merged to 'H_COPY'
# during a cherry harvest and commit it as r9.
@@ -10800,7 +10681,7 @@ def dont_merge_revs_into_subtree_that_pr
expected_output = wc.State(wc_dir, {'A/D/H/psi' : Item(verb='Sending')})
expected_status.tweak('A/D/H/psi', wc_rev=9)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_disk.tweak('A/D/H/psi', contents="Even *newer* content")
# Update WC so elision occurs smoothly.
@@ -10878,7 +10759,7 @@ def set_up_renamed_subtree(sbox):
expected_output = wc.State(wc_dir, {'A/D/H/psi' : Item(verb='Sending')})
expected_status.tweak('A/D/H/psi', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_disk.tweak('A/D/H/psi', contents="New content")
# Make a text mod to 'A/D/H/omega' and commit it as r3
@@ -10886,7 +10767,7 @@ def set_up_renamed_subtree(sbox):
expected_output = wc.State(wc_dir, {'A/D/H/omega' : Item(verb='Sending')})
expected_status.tweak('A/D/H/omega', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_disk.tweak('A/D/H/omega', contents="New omega")
# Move 'A/D/H/psi' to 'A/D/H/psi_moved' and commit it as r4.
@@ -10908,7 +10789,7 @@ def set_up_renamed_subtree(sbox):
"", psi_moved_path)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Copy 'A/D/H' to 'H_COPY' in r5.
svntest.actions.run_and_verify_svn(['Committing transaction...\n',
@@ -10933,7 +10814,7 @@ def set_up_renamed_subtree(sbox):
{'A/D/H/psi_moved' : Item(verb='Sending')})
expected_status.tweak('A/D/H/psi_moved', wc_rev=6)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_disk.remove('A/D/H/psi')
expected_disk.add({
'A/D/H/psi_moved' : Item("Even *Newer* content"),
@@ -11149,14 +11030,14 @@ def dont_explicitly_record_implicit_merg
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Adding')})
wc_status.add({'A/D/H/nu' : Item(status=' ', wc_rev=6)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r7 - Make a change to 'A/D/H/nu'.
svntest.main.file_write(nu_path, "Nu content")
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Sending')})
wc_status.tweak('A/D/H/nu', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r8 - Merge r6 to 'A_copy'.
expected_output = wc.State(A_copy_path, {
@@ -11229,7 +11110,7 @@ def dont_explicitly_record_implicit_merg
'A_copy' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r9 - Merge r7 to 'A_copy/D/H/nu'.
expected_skip = wc.State(nu_copy_path, { })
@@ -11244,7 +11125,7 @@ def dont_explicitly_record_implicit_merg
expected_output = wc.State(wc_dir, {'A_copy/D/H/nu' : Item(verb='Sending')})
wc_status.tweak('A_copy/D/H/nu', wc_rev=9)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Update WC
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -11255,7 +11136,7 @@ def dont_explicitly_record_implicit_merg
expected_output = wc.State(wc_dir, {'A/D/H/nu' : Item(verb='Sending')})
wc_status.tweak('A/D/H/nu', wc_rev=10)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Update WC
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -11391,7 +11272,7 @@ def subtree_merges_dont_intersect_with_t
})
wc_status.tweak('A/D/gamma', 'A/D/H/psi', wc_rev=8)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
wc_disk.tweak('A/D/gamma', contents="New content")
wc_disk.tweak('A/D/H/psi', contents="Even newer content")
@@ -11464,9 +11345,7 @@ def subtree_merges_dont_intersect_with_t
wc_rev=9)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None,
- wc_dir)
+ wc_status)
# Update the WC.
svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [],
@@ -12081,7 +11960,7 @@ def commit_to_subtree_added_by_merge(sbo
wc_status.add({'A/D/H/N' : Item(status=' ', wc_rev=3),
'A/D/H/N/nu' : Item(status=' ', wc_rev=3)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Merge r3 to 'A_COPY/D/H', creating A_COPY/D/H/N' and 'A_COPY/D/H/N/nu'.
# Commit the merge as r4.
@@ -12128,7 +12007,7 @@ def commit_to_subtree_added_by_merge(sbo
'A_COPY/D/H/N/nu' : Item(status=' ', wc_rev=4)})
wc_status.tweak('A_COPY/D/H', wc_rev=4)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Make a text change to 'A_COPY/D/H/N/nu' and commit it as r5. This
# is the first place issue #3240 appears over DAV layers, and the
@@ -12147,7 +12026,7 @@ def commit_to_subtree_added_by_merge(sbo
{'A_COPY/D/H/N/nu' : Item(verb='Sending')})
wc_status.tweak('A_COPY/D/H/N/nu', wc_rev=5)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# The second place issue #3240 shows up is in the fact that the commit
# *did* succeed, but the wrong path ('A/D/H/nu' rather than 'A_COPY/D/H/nu')
# is affected. We can see this by running an update; since we just
@@ -12261,15 +12140,14 @@ def subtree_merges_dont_cause_spurious_c
expected_output = wc.State(wc_dir, {'A/D/G/rho' : Item(verb='Sending')})
wc_status.tweak('A/D/G/rho', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
wc_disk.tweak('A/D/G/rho', contents="Newer content")
# r8 Make another text change to A/D/G/rho.
svntest.main.file_write(rho_path, "Even *newer* content")
expected_output = wc.State(wc_dir, {'A/D/G/rho' : Item(verb='Sending')})
wc_status.tweak('A/D/G/rho', wc_rev=8)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
wc_disk.tweak('A/D/G/rho', contents="Even *newer* content")
# Update the WC to allow full mergeinfo inheritance and elision.
@@ -12365,7 +12243,7 @@ def subtree_merges_dont_cause_spurious_c
'A_COPY/D/H/omega',
wc_rev=9)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Update the WC to allow full mergeinfo inheritance and elision.
svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [], 'up',
@@ -12485,14 +12363,14 @@ def merge_target_and_subtrees_need_nonin
expected_output = wc.State(wc_dir, {'A/D/G/nu' : Item(verb='Adding')})
wc_status.add({'A/D/G/nu' : Item(status=' ', wc_rev=7)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Make a text mod to A/D/G/nu in r8.
svntest.main.file_write(nu_path, "New content")
expected_output = wc.State(wc_dir, {'A/D/G/nu' : Item(verb='Sending')})
wc_status.tweak('A/D/G/nu', wc_rev=8)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Do several merges to setup a situation where the merge
# target and two of its subtrees need non-intersecting ranges
@@ -12541,8 +12419,7 @@ def merge_target_and_subtrees_need_nonin
'A_COPY/D/H/omega' : Item(verb='Sending'),
'A_COPY/D/H/psi' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Update the WC to allow full mergeinfo inheritance and elision.
svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [], 'up',
@@ -12872,8 +12749,7 @@ def merge_adds_mergeinfo_correctly(sbox)
'A_COPY' : Item(verb='Sending'),
'A_COPY/D/G/rho' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Merge r7 from A/D to A_COPY_2/D and commit as r9.
# This creates explicit mergeinfo on A_COPY_2/D of '/A/D:7'.
@@ -12927,8 +12803,7 @@ def merge_adds_mergeinfo_correctly(sbox)
'A_COPY_2/D' : Item(verb='Sending'),
'A_COPY_2/D/H/omega' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Merge r9 from A_COPY_2 to A_COPY. A_COPY/D gets the explicit mergeinfo
# '/A/D/:7' added from r9. But it prior to the merge it inherited '/A/D:5'
@@ -13150,16 +13025,14 @@ def natural_history_filtering(sbox):
expected_output = wc.State(wc_dir, {"A_COPY_2" : Item(verb='Adding')})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- wc_status,
- None,
- wc_dir)
+ wc_status)
# r8: Make a text change under A, to A/D/H/chi.
svntest.main.file_write(chi_path, "New content")
expected_output = wc.State(wc_dir, {'A/D/H/chi' : Item(verb='Sending')})
wc_status.tweak('A/D/H/chi', wc_rev=8)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
wc_disk.tweak('A/D/H/psi', contents="New content")
# r9: Merge all available revisions from A to A_COPY. But first
@@ -13247,8 +13120,7 @@ def natural_history_filtering(sbox):
'A_COPY/D/H/psi' : Item(verb='Sending'),
'A_COPY/D/H/omega' : Item(verb='Sending'),
})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# Again update the working copy to allow full inheritance and elision.
svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [],
@@ -13477,8 +13349,7 @@ def no_self_referential_filtering_on_add
wc_status.tweak('A_COPY/C', wc_rev=8)
wc_disk.tweak("A_COPY/C",
props={'propname' : 'propval'})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# r9: Merge r8 from A_COPY to A.
#
@@ -13495,8 +13366,7 @@ def no_self_referential_filtering_on_add
{'A' : Item(verb='Sending'),
'A/C' : Item(verb='Sending')})
wc_status.tweak('A', 'A/C', wc_rev=9)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
wc_disk.tweak("A/C",
props={'propname' : 'propval'})
@@ -13660,7 +13530,7 @@ def merge_range_prior_to_rename_source_e
wc_status.add({'A/D/H/nu' : Item(status=' ', wc_rev=9)})
wc_status.tweak('A/B/E/alpha', wc_rev=9)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r10 - Merge all available revisions (i.e. -r1:9) from A to A_COPY.
svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [], 'up',
@@ -13693,7 +13563,7 @@ def merge_range_prior_to_rename_source_e
wc_rev=10)
wc_status.add({'A_COPY/D/H/nu' : Item(status=' ', wc_rev=10)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r11 - Reverse merge -r9:1 from A/B to A_COPY/B
svntest.actions.run_and_verify_svn(exp_noop_up_out(10), [], 'up',
@@ -13713,7 +13583,7 @@ def merge_range_prior_to_rename_source_e
'A_COPY/B/E/beta',
wc_rev=11)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# r12 - Move A/D/H/nu to A/D/H/nu_moved
svntest.actions.run_and_verify_svn(["Committing transaction...\n",
@@ -14015,7 +13885,7 @@ def set_up_natural_history_gap(sbox):
# Update the WC to a uniform revision.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [],
'up', wc_dir)
return wc_disk, wc_status
@@ -14518,8 +14388,7 @@ def copy_then_replace_via_merge(sbox):
})
actions.run_and_verify_commit(branch_J,
expected_output,
- expected_status,
- None, branch_J)
+ expected_status)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -15112,8 +14981,7 @@ def committed_case_only_move_and_revert(
wc_status.remove('A_COPY/mu')
wc_status.add({'A_COPY/MU': Item(status=' ', wc_rev=4)})
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, wc_status)
# In issue #3115 the WC gets corrupted and any subsequent revert
# attempts fail with this error:
@@ -16213,8 +16081,7 @@ def dry_run_merge_conflicting_binary(sbo
'A/theta' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# Make the "other" working copy
other_wc = sbox.add_wc_path('other')
@@ -16230,8 +16097,7 @@ def dry_run_merge_conflicting_binary(sbo
'A/theta' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# In second working copy, append different content to the binary
# and attempt to 'svn merge -r 2:3'.
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri Feb 27 18:57:57 2015
@@ -78,9 +78,7 @@ def delete_file_and_dir(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Rev 3 delete E and lambda from B
E_path = os.path.join(B_path, 'E')
@@ -98,9 +96,7 @@ def delete_file_and_dir(sbox):
'A/B/lambda')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def modify_B2():
# Local mods in B2
@@ -203,8 +199,7 @@ def merge_catches_nonexistent_target(sbo
### (M)odified child.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Change newfile, creating r3.
svntest.main.file_append(newfile_path, 'A change to newfile.\n')
@@ -214,8 +209,7 @@ def merge_catches_nonexistent_target(sbo
expected_status.tweak('A/D/Q/newfile', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Merge the change to newfile (from r3) into G, where newfile
# doesn't exist. This is a tree conflict (use case 4, see
@@ -377,8 +371,7 @@ def three_way_merge_add_of_existing_bina
"A/theta" : Item(status=" ", wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# In the working copy, attempt to 'svn merge branch_A_url@2 A_url@3 A'.
# We should *not* see a conflict during the merge, but an 'A'.
@@ -514,8 +507,7 @@ def merge_add_over_versioned_file_confli
'A/C/alpha' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None,
- wc_dir)
+ expected_status)
# Merge r1:2 from A/C to A/B/E. This will attempt to add A/C/alpha,
# but since A/B/E/alpha already exists we get a tree conflict.
@@ -573,14 +565,14 @@ def mergeinfo_recording_in_skipped_merge
expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
wc_status.add({'A/mu' : Item(status=' ', wc_rev=3)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Make a modification to A/B/E/alpha
svntest.main.file_write(alpha_path, "This is the file 'alpha' modified.\n")
expected_output = wc.State(wc_dir, {'A/B/E/alpha' : Item(verb='Sending')})
wc_status.add({'A/B/E/alpha' : Item(status=' ', wc_rev=4)})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- wc_status, None, wc_dir)
+ wc_status)
# Delete A_COPY/B/E
svntest.actions.run_and_verify_svn(None, [], 'rm',
@@ -1566,8 +1558,7 @@ def merge_replace_setup(sbox):
'branch/D/H/chi', 'branch/D/H/psi', 'branch/D/G/pi', 'branch/B/E',
'branch/B/E/beta', 'branch/B/E/alpha')
- actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
- None, wc_dir)
+ actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
# svn up
expected_output = svntest.wc.State(wc_dir, {})
@@ -1643,8 +1634,7 @@ def merge_replace_setup(sbox):
'branch/mu' : Item(status=' ', wc_rev='4'),
})
- actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
- None, wc_dir)
+ actions.run_and_verify_commit(wc_dir, expected_output, expected_status)
return expected_disk, expected_status
Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Fri Feb 27 18:57:57 2015
@@ -234,7 +234,7 @@ def non_inheritable_mergeinfo(sbox):
})
expected_status.tweak('A_COPY', 'A_COPY/D/G/rho', wc_rev=7)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Update the WC a last time to ensure full inheritance.
svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [], 'up',