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 23:37:13 UTC
svn commit: r1662838 [3/5] - 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=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Feb 27 22:37:13 2015
@@ -259,12 +259,9 @@ def textual_merges_galore(sbox):
expected_disk,
expected_status,
expected_skip,
- None,
- svntest.tree.detect_conflict_files,
- (list(tau_conflict_support_files)),
- None, None, False, True,
- '--allow-mixed-revisions',
- other_wc)
+ [], False, True,
+ '--allow-mixed-revisions', other_wc,
+ extra_files=list(tau_conflict_support_files))
# Now reverse merge r3 into A/D/G/rho, give it non-conflicting local
# mods, then merge in the 2:3 change. ### Not bothering to do the
@@ -346,8 +343,7 @@ def textual_merges_galore(sbox):
expected_disk,
expected_status,
expected_skip,
- None,
- svntest.tree.detect_conflict_files, list(tau_conflict_support_files))
+ extra_files=list(tau_conflict_support_files))
svntest.actions.run_and_verify_svn([], '.*W200017: Property.*not found',
@@ -456,8 +452,7 @@ def add_with_history(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1) # check props
+ check_props=True)
expected_output = svntest.wc.State(wc_dir, {
'A/C' : Item(verb='Sending'),
@@ -608,7 +603,7 @@ def simple_property_merges(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Revert merge
svntest.actions.run_and_verify_svn(None, [],
@@ -629,7 +624,7 @@ def simple_property_merges(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
def error_message(property, old_value, new_value):
return "Trying to change property '%s'\n" \
@@ -663,7 +658,7 @@ def simple_property_merges(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# issue 1109 : single file property merge. This test performs a merge
# that should be a no-op (adding properties that are already present).
@@ -1225,7 +1220,7 @@ def merge_binary_file(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
+ [],
True, True, '--allow-mixed-revisions',
other_wc)
@@ -1400,8 +1395,7 @@ def merge_skips_obstructions(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 0)
+ [], True)
# Revert the local mods, and this time make "Q" obstructed. An
# unversioned file called "Q" will obstruct the adding of the
@@ -1443,8 +1437,7 @@ def merge_skips_obstructions(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 0)
+ [], True)
# Revert the local mods, and commit the deletion of iota and A/D/G. (r3)
os.unlink(os.path.join(C_path, "foo"))
@@ -1503,7 +1496,7 @@ def merge_skips_obstructions(sbox):
expected_disk,
expected_status.copy(wc_dir),
expected_skip,
- None, None, None, None, None,
+ [],
True, False, '--allow-mixed-revisions',
wc_dir)
@@ -1566,7 +1559,7 @@ def merge_skips_obstructions(sbox):
expected_disk,
expected_status_short,
expected_skip,
- None, None, None, None, None,
+ [],
True, False, '--allow-mixed-revisions',
wc_dir)
@@ -1615,7 +1608,7 @@ def merge_skips_obstructions(sbox):
expected_disk,
expected_status.copy(wc_dir),
expected_skip,
- None, None, None, None, None,
+ [],
1, 0, '--ignore-ancestry',
'--allow-mixed-revisions', wc_dir)
@@ -1714,8 +1707,8 @@ def merge_into_missing(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 0, 0, '--dry-run',
+ [], False, False,
+ '--dry-run',
'--ignore-ancestry',
'--allow-mixed-revisions',
F_path)
@@ -1739,8 +1732,7 @@ def merge_into_missing(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 0, 0,
+ [], False, False,
'--ignore-ancestry',
'--allow-mixed-revisions',
F_path)
@@ -1823,9 +1815,7 @@ def dry_run_adds_file_with_prop(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, # please check props
- 1) # and do a dry-run also)
+ [], True, True)
#----------------------------------------------------------------------
# Regression test for issue #1673
@@ -2080,9 +2070,9 @@ def merge_funny_chars_on_path(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 0, # don't check props
- 1) # but do a dry-run
+ [],
+ False, # don't check props
+ True) # but do a dry-run
expected_output_dic = {}
@@ -2311,10 +2301,9 @@ def merge_dir_replace(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1,
- 0) # don't do a dry-run
- # the output differs
+ [], True,
+ False) # don't do a dry-run
+ # the output differs
# Commit merge of foo onto C
expected_output = svntest.wc.State(wc_dir, {
@@ -2418,10 +2407,10 @@ def merge_dir_and_file_replace(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1,
- 0) # don't do a dry-run
- # the output differs
+ [],
+ True,
+ False) # don't do a dry-run
+ # the output differs
# Commit merge of foo onto C
expected_output = svntest.wc.State(wc_dir, {
@@ -2661,12 +2650,8 @@ def safe_property_merge(sbox):
expected_disk,
expected_status,
expected_skip,
- None, # expected error string
- svntest.tree.detect_conflict_files,
- extra_files,
- None, None, # no B singleton handler
- 1, # check props
- 0) # dry_run
+ [], True, False,
+ extra_files=extra_files)
#----------------------------------------------------------------------
# Test for issue 2035, whereby 'svn merge' wouldn't always mark
@@ -2788,12 +2773,8 @@ def property_merge_from_branch(sbox):
expected_disk,
expected_status,
expected_skip,
- None, # expected error string
- svntest.tree.detect_conflict_files,
- extra_files,
- None, None, # no B singleton handler
- 1, # check props
- 0) # dry_run
+ [], True, False,
+ extra_files=extra_files)
#----------------------------------------------------------------------
# Another test for issue 2035, whereby sometimes 'svn merge' marked
@@ -2845,11 +2826,7 @@ def property_merge_undo_redo(sbox):
expected_disk,
expected_status,
expected_skip,
- None, # expected error string
- None, None, # no A singleton handler
- None, None, # no B singleton handler
- 1, # check props
- 0) # dry_run
+ [], True, False)
# Change mind, re-apply the change ('svn merge -r1:2').
# This should merge cleanly into existing prop-mod, status shows nothing.
@@ -2879,11 +2856,7 @@ def property_merge_undo_redo(sbox):
expected_disk,
expected_status,
expected_skip,
- None, # expected error string
- None, None, # no A singleton handler
- None, None, # no B singleton handler
- 1, # check props
- 0, # dry_run
+ [], True, False,
'--ignore-ancestry', wc_dir)
@@ -2987,13 +2960,10 @@ def cherry_pick_text_conflict(sbox):
expected_status,
expected_skip,
expected_error,
- svntest.tree.detect_conflict_files,
+ extra_files=
["mu\.working",
"mu\.merge-right\.r4",
- "mu\.merge-left\.r3"],
- None, None, # no singleton handler
- 0, # don't check props
- 0) # not a dry_run
+ "mu\.merge-left\.r3"])
#----------------------------------------------------------------------
# Test for issue 2135
@@ -3178,7 +3148,7 @@ def merge_file_replace_to_mixed_rev_wc(s
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
+ [],
True, False, '--allow-mixed-revisions',
wc_dir)
@@ -3261,8 +3231,8 @@ def merge_ignore_whitespace(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 0, 0, '--allow-mixed-revisions',
+ [], False, False,
+ '--allow-mixed-revisions',
'-x', '-w', wc_dir)
#----------------------------------------------------------------------
@@ -3341,8 +3311,8 @@ def merge_ignore_eolstyle(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 0, 0, '--allow-mixed-revisions',
+ [], False, False,
+ '--allow-mixed-revisions',
'-x', '--ignore-eol-style', wc_dir)
#----------------------------------------------------------------------
@@ -3778,11 +3748,7 @@ def avoid_repeated_merge_using_inherited
expected_disk,
expected_status,
expected_skip,
- None,
- None,
- None,
- None,
- None, 1)
+ check_props=True)
# Commit the result of the merge, creating revision 6.
expected_output = svntest.wc.State(copy_of_B_path, {
@@ -3888,11 +3854,7 @@ def avoid_repeated_merge_on_subtree_with
expected_disk,
expected_status,
expected_skip,
- None,
- None,
- None,
- None,
- None, 1)
+ check_props=True)
# Commit the result of the merge, creating new revision.
expected_output = svntest.wc.State(path_name, {
@@ -3970,11 +3932,7 @@ def avoid_repeated_merge_on_subtree_with
expected_disk,
expected_status,
expected_skip,
- None,
- None,
- None,
- None,
- None, 1)
+ check_props=True)
# Test for part of Issue #2821, see
# http://subversion.tigris.org/issues/show_bug.cgi?id=2821#desc22
@@ -4028,11 +3986,7 @@ def avoid_repeated_merge_on_subtree_with
expected_disk,
expected_status,
expected_skip,
- None,
- None,
- None,
- None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
def tweak_src_then_merge_to_dest(sbox, src_path, dst_path,
@@ -4206,11 +4160,7 @@ def obey_reporter_api_semantics_while_do
expected_disk,
expected_status,
expected_skip,
- None,
- None,
- None,
- None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -4292,8 +4242,7 @@ def mergeinfo_inheritance(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge r4 again, this time into A_COPY/D/G. An ancestor directory
# (A_COPY/D) exists with identical local mergeinfo, so the merge
@@ -4327,8 +4276,7 @@ def mergeinfo_inheritance(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge r5 into A_COPY/B. Again, r1 should be inherited from
# A_COPY (Issue #2733)
@@ -4366,8 +4314,7 @@ def mergeinfo_inheritance(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge r5 again, this time into A_COPY/B/E/beta. An ancestor
# directory (A_COPY/B) exists with identical local mergeinfo, so
@@ -4453,8 +4400,7 @@ def mergeinfo_inheritance(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge r6 into A_COPY/D/H/omega, it should inherit it's nearest
# ancestor's (A_COPY/D) mergeinfo (Issue #2733 with a file as the
@@ -4551,8 +4497,7 @@ def mergeinfo_inheritance(sbox):
# expected_disk,
# expected_status,
# expected_skip,
- # None, None, None, None,
- # None, 1)
+ # check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -4645,8 +4590,7 @@ def mergeinfo_elision(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge r3:6 into A_COPY. The merge doesn't touch either of A_COPY's
# subtrees with explicit mergeinfo, so those are left alone.
@@ -4710,8 +4654,7 @@ def mergeinfo_elision(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# New repeat the above merge but with the --record-only option.
# This would result in identical mergeinfo
# (r4-6) on A_COPY and two of its descendants, A_COPY/D/G and
@@ -4745,8 +4688,8 @@ def mergeinfo_elision(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 1, '--record-only',
+ [], True, True,
+ '--record-only',
A_COPY_path)
# Reverse merge r5 out of A_COPY/B/E/beta. The mergeinfo on
@@ -4892,8 +4835,7 @@ def mergeinfo_inheritance_and_discontinu
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Wipe the memory of a portion of the previous merge...
### It'd be nice to use 'merge --record-only' here, but we can't (yet)
@@ -4952,8 +4894,7 @@ def merge_to_target_with_copied_children
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1)
+ check_props=True)
# Merge r4 into A_COPY/D/G/rho_copy.
svntest.actions.run_and_verify_svn(
@@ -4997,8 +4938,7 @@ def merge_to_target_with_copied_children
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -5069,7 +5009,7 @@ def merge_to_switched_path(sbox):
svntest.actions.run_and_verify_switch(sbox.wc_dir, A_COPY_D_G_path,
sbox.repo_url + "/A/D/G",
expected_output, wc_disk, wc_status,
- None, None, None, None, None, 1)
+ [], 1)
# Update working copy to allow elision (if any).
svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [],
@@ -5118,7 +5058,7 @@ def merge_to_switched_path(sbox):
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Check that the mergeinfo set on a switched target can elide to the
# repository.
@@ -5227,7 +5167,7 @@ def merge_to_path_with_switched_children
svntest.actions.run_and_verify_switch(sbox.wc_dir, A_COPY_G_path,
sbox.repo_url + "/A_COPY_2/D/G",
expected_output, wc_disk, wc_status,
- None, None, None, None, None, 1)
+ [], 1)
# Switch A_COPY/D/G/rho to A_COPY_3/D/G/rho.
wc_status.tweak("A_COPY/D/G/rho", switched='S')
@@ -5235,7 +5175,7 @@ def merge_to_path_with_switched_children
svntest.actions.run_and_verify_switch(sbox.wc_dir, A_COPY_rho_path,
sbox.repo_url + "/A_COPY_3/D/G/rho",
expected_output, wc_disk, wc_status,
- None, None, None, None, None, 1)
+ [], 1)
# Switch A_COPY/D/H/psi to A_COPY_2/D/H/psi.
wc_status.tweak("A_COPY/D/H/psi", switched='S')
@@ -5243,7 +5183,7 @@ def merge_to_path_with_switched_children
svntest.actions.run_and_verify_switch(sbox.wc_dir, A_COPY_psi_path,
sbox.repo_url + "/A_COPY_2/D/H/psi",
expected_output, wc_disk, wc_status,
- None, None, None, None, None, 1)
+ [], 1)
# Target with switched file child:
#
@@ -5290,7 +5230,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Target with switched dir child:
#
@@ -5341,7 +5281,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk_D,
expected_status_D, expected_skip_D,
- None, None, None, None, None, 1)
+ check_props=True)
# Merge r5 from A/D into A_COPY/D. This updates the mergeinfo on the
@@ -5370,7 +5310,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk_D,
expected_status_D, expected_skip_D,
- None, None, None, None, None, 1)
+ check_props=True)
# Finally, merge r4:8 into A_COPY. A_COPY gets mergeinfo for r5-8 added but
# since none of A_COPY's subtrees with mergeinfo are affected, none of them
@@ -5435,7 +5375,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Commit changes thus far.
expected_output = svntest.wc.State(wc_dir, {
'A_COPY' : Item(verb='Sending'),
@@ -5475,7 +5415,7 @@ def merge_to_path_with_switched_children
svntest.actions.run_and_verify_switch(sbox.wc_dir, A_COPY_psi_path,
sbox.repo_url + "/A_COPY/D/H/psi",
expected_output, wc_disk, wc_status,
- None, None, None, None, None, 1)
+ [], 1)
# Non-inheritable mergeinfo ranges on a target don't prevent repeat
# merges of that range on the target's children.
@@ -5520,7 +5460,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None,
+ [],
True, False, '--allow-mixed-revisions',
A_COPY_H_path)
@@ -5570,7 +5510,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk_D,
expected_status_D, expected_skip_D,
- None, None, None, None, None,
+ [],
True, False, '--allow-mixed-revisions',
A_COPY_D_path)
# Repeated merge is a no-op, though we still see the notification reporting
@@ -5587,7 +5527,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk_D,
expected_status_D, expected_skip_D,
- None, None, None, None, None,
+ [],
True, False, '--allow-mixed-revisions',
A_COPY_D_path)
@@ -5679,7 +5619,7 @@ def merge_to_path_with_switched_children
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Test for issue 2047: Merge from parent dir fails while it succeeds from
@@ -5815,8 +5755,7 @@ def empty_mergeinfo(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Now do the reverse merge into the subtree.
expected_output = wc.State(H_COPY_path, {
'psi' : Item(status='G '),
@@ -5847,8 +5786,7 @@ def empty_mergeinfo(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Test areas B and C -- Reverse merge r3 into A_COPY, this would result in
# empty mergeinfo on A_COPY and A_COPY/D/H, but the empty mergeinfo on the
@@ -5949,8 +5887,7 @@ def prop_add_to_child_with_mergeinfo(sbo
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@Issue(2788,3383)
@@ -6188,8 +6125,8 @@ def avoid_reflected_revs(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1,
- None, A_COPY_path,
+ [], True, False,
+ A_COPY_path,
'--allow-mixed-revisions')
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -6228,8 +6165,8 @@ def avoid_reflected_revs(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1,
- None, A_COPY_path,
+ [], True, False,
+ A_COPY_path,
'--allow-mixed-revisions')
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -6325,7 +6262,7 @@ def avoid_reflected_revs(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -6443,7 +6380,7 @@ def update_loses_mergeinfo(sbox):
expected_output,
expected_disk,
expected_status,
- check_props=1)
+ check_props=True)
#----------------------------------------------------------------------
# Tests part of issue# 2829.
@@ -6644,7 +6581,7 @@ def merge_to_out_of_date_target(sbox):
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Commit merge to first WC.
wc_status.tweak('A_COPY/D/H/psi', 'A_COPY/D/H', wc_rev=7)
@@ -6685,7 +6622,7 @@ def merge_to_out_of_date_target(sbox):
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=1)
# Update A_COPY/D/H in other WC. Local mergeinfo for r6 on A_COPY/D/H
# should be *merged* with r3 from first WC.
@@ -6709,7 +6646,7 @@ def merge_to_out_of_date_target(sbox):
expected_output,
other_disk,
other_status,
- check_props=1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -6822,7 +6759,7 @@ def merge_with_depth_files(sbox):
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 1,
+ [], True, True,
'--depth', 'files', Acopy_path)
#----------------------------------------------------------------------
@@ -6918,7 +6855,7 @@ def merge_away_subtrees_noninheritable_r
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 1,
+ [], True, True,
'--depth', 'immediates', D_COPY_path)
# Repeat the previous merge but at default depth of infinity. The change
@@ -6950,7 +6887,7 @@ def merge_away_subtrees_noninheritable_r
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
# Now test the problem described in
# http://svn.haxx.se/dev/archive-2008-12/0133.shtml.
@@ -7046,8 +6983,7 @@ def merge_away_subtrees_noninheritable_r
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
os.chdir(saved_cwd)
# If a merge target has inheritable and non-inheritable ranges and has a
@@ -7143,9 +7079,7 @@ def merge_away_subtrees_noninheritable_r
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1,
- False) # No dry-run.
+ [], True, False)
os.chdir(saved_cwd)
# Test for issue #3392
@@ -7186,7 +7120,7 @@ def merge_away_subtrees_noninheritable_r
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 1,
+ [], True, True,
'--depth', 'empty', H_COPY_2_path)
svntest.actions.run_and_verify_svn(None, [], 'commit', '-m',
'log msg', wc_dir)
@@ -7215,7 +7149,7 @@ def merge_away_subtrees_noninheritable_r
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Test issue #3407 'Shallow merges incorrectly set mergeinfo on children'.
#
@@ -7336,7 +7270,7 @@ def merge_to_sparse_directories(sbox):
svntest.actions.run_and_verify_checkout(sbox.repo_url + "/A_COPY",
immediates_dir,
expected_output, expected_disk,
- None, None, None, None,
+ [],
"--depth", "immediates")
# Merge r4:9 into the immediates WC.
@@ -7393,8 +7327,7 @@ def merge_to_sparse_directories(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Do a --files checkout of A_COPY
files_dir = sbox.add_wc_path('files')
@@ -7407,7 +7340,7 @@ def merge_to_sparse_directories(sbox):
svntest.actions.run_and_verify_checkout(sbox.repo_url + "/A_COPY",
files_dir,
expected_output, expected_disk,
- None, None, None, None,
+ [],
"--depth", "files")
# Merge r4:9 into the files WC.
@@ -7450,8 +7383,7 @@ def merge_to_sparse_directories(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Do an --empty checkout of A_COPY
empty_dir = sbox.add_wc_path('empty')
@@ -7460,7 +7392,7 @@ def merge_to_sparse_directories(sbox):
svntest.actions.run_and_verify_checkout(sbox.repo_url + "/A_COPY",
empty_dir,
expected_output, expected_disk,
- None, None, None, None,
+ [],
"--depth", "empty")
# Merge r4:9 into the empty WC.
@@ -7497,8 +7429,7 @@ def merge_to_sparse_directories(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Check that default depth for merge is infinity.
#
@@ -7561,8 +7492,7 @@ def merge_to_sparse_directories(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -7719,8 +7649,7 @@ def merge_old_and_new_revs_from_renamed_
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- True, False)
+ [], True, False)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -7883,7 +7812,7 @@ def merge_with_child_having_different_re
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Revert r5 and r6 on A_COPY/mu
svntest.actions.run_and_verify_svn(
expected_merge_output([[6,5]],
@@ -7916,7 +7845,7 @@ def merge_with_child_having_different_re
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
expected_disk.add({'' : Item(props={SVN_PROP_MERGEINFO : '/A:4-6',
'prop1' : 'val1'})})
@@ -7940,7 +7869,7 @@ def merge_with_child_having_different_re
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
#Revert r5 on A_COPY/mu
svntest.actions.run_and_verify_svn(
expected_merge_output([[-5]],
@@ -7976,7 +7905,7 @@ def merge_with_child_having_different_re
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -8174,8 +8103,7 @@ def merge_with_auto_rev_range_detection(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
# Test for issue 2818: Provide a 'merge' API which allows for merging of
@@ -8205,7 +8133,7 @@ def cherry_picking(sbox):
wc_status.tweak(wc_rev='6')
svntest.actions.run_and_verify_update(wc_dir, expected_output,
wc_disk, wc_status,
- None, None, None, None, None, True)
+ check_props=True)
# Make some prop changes to some dirs.
svntest.actions.run_and_verify_svn(["property 'prop:name' set on '" +
@@ -8429,8 +8357,8 @@ def propchange_of_subdir_raises_conflict
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1, '--depth', 'files',
+ [], True, True,
+ '--depth', 'files',
A_COPY_B_path)
# Merge /A/B to /A_COPY/B ie., r1 to r3 with infinite depth
@@ -8469,8 +8397,7 @@ def propchange_of_subdir_raises_conflict
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1)
+ [], 1, 1)
#----------------------------------------------------------------------
# Test for issue #2971: Reverse merge of prop add segfaults if
@@ -8530,8 +8457,7 @@ def reverse_merge_prop_add_on_child(sbox
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Now merge -c-3 but target the previous target's parent instead.
expected_output = wc.State(D_COPY_path, {
@@ -8577,8 +8503,7 @@ def reverse_merge_prop_add_on_child(sbox
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@XFail()
@@ -8655,8 +8580,8 @@ def merge_target_with_non_inheritable_me
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1, '--depth', 'immediates',
+ [], True, True,
+ '--depth', 'immediates',
A_COPY_B_path)
# Merge /A/B to /A_COPY/B ie., r1 to r3 with infinite depth
@@ -8695,8 +8620,7 @@ def merge_target_with_non_inheritable_me
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -8747,7 +8671,7 @@ def self_reverse_merge(sbox):
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
# record dummy self mergeinfo to test the fact that self-reversal should work
@@ -8771,7 +8695,7 @@ def self_reverse_merge(sbox):
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -8837,7 +8761,7 @@ def ignore_ancestry_and_mergeinfo(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
# Now, revert lambda and repeat the merge. Nothing should happen.
svntest.actions.run_and_verify_svn(None, [], 'revert', '-R',
@@ -8856,7 +8780,7 @@ def ignore_ancestry_and_mergeinfo(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
# Now, try the merge again with --ignore-ancestry. We should get
# lambda re-modified. */
@@ -8877,7 +8801,7 @@ def ignore_ancestry_and_mergeinfo(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1, 1,
+ [], True, True,
'--ignore-ancestry', A_COPY_B_path)
#----------------------------------------------------------------------
@@ -8955,7 +8879,7 @@ def merge_from_renamed_branch_fails_whil
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
expected_output = wc.State(A_C_path, {
'file1' : Item(status='U '),
@@ -8979,7 +8903,7 @@ def merge_from_renamed_branch_fails_whil
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
# Test for part of issue #2877: 'do subtree merge only if subtree has
@@ -9080,8 +9004,7 @@ def merge_source_normalization_and_subtr
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge -c8 URL/A_MOVED/D A_COPY/D.
#
@@ -9132,8 +9055,7 @@ def merge_source_normalization_and_subtr
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Tests for issue #3067: 'subtrees with intersecting mergeinfo, that don't
@@ -9198,7 +9120,7 @@ def new_subtrees_should_not_break_merge(
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# run_and_verify_merge doesn't support merging to a file WCPATH
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
@@ -9274,8 +9196,7 @@ def new_subtrees_should_not_break_merge(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
expected_output = wc.State(D_COPY_path, {
'H/omega': Item(status='G '),
})
@@ -9320,8 +9241,7 @@ def new_subtrees_should_not_break_merge(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Now once again merge r6 to A_COPY. A_COPY already has r6 in its mergeinfo
# so we expect only subtree merges on A_COPY/D, A_COPY_D_H, and
# A_COPY/D/H/nu. The fact that A/D/H/nu doesn't exist at r6 should not cause
@@ -9392,8 +9312,7 @@ def new_subtrees_should_not_break_merge(
expected_disk_1,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Commit this merge as r9.
#
@@ -9491,8 +9410,7 @@ def new_subtrees_should_not_break_merge(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Revert the previous merge, then merge r4 to A_COPY/D/G/rho. Commit
# this merge as r10.
@@ -9561,8 +9479,7 @@ def new_subtrees_should_not_break_merge(
expected_disk_1,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -9645,8 +9562,7 @@ def dont_add_mergeinfo_from_own_history(
expected_A_COPY_disk,
expected_A_COPY_status,
expected_A_COPY_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Change 'A_COPY/mu'
svntest.main.file_write(mu_COPY_path, "New content")
@@ -9722,8 +9638,7 @@ def dont_add_mergeinfo_from_own_history(
expected_A_disk,
expected_A_status,
expected_A_skip,
- None, None, None, None,
- None, True, False,
+ [], True, False,
'--allow-mixed-revisions', A_path)
# Revert all local mods
@@ -9821,8 +9736,7 @@ def dont_add_mergeinfo_from_own_history(
expected_output,
wc_disk,
wc_status,
- None, None, None, None, None,
- True)
+ check_props=True)
expected_output = wc.State(A_MOVED_path, {
'mu' : Item(status='U '),
@@ -9862,8 +9776,7 @@ def dont_add_mergeinfo_from_own_history(
expected_A_disk,
expected_A_status,
expected_A_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Revert all local mods
svntest.actions.run_and_verify_svn(["Reverted '" + A_MOVED_path + "'\n",
@@ -10035,8 +9948,7 @@ def dont_add_mergeinfo_from_own_history(
expected_A_disk,
expected_A_status,
expected_A_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -10525,7 +10437,7 @@ def reverse_merge_away_all_mergeinfo(sbo
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Commit the merge as r7
expected_output = wc.State(wc_dir, {
@@ -10570,7 +10482,7 @@ def reverse_merge_away_all_mergeinfo(sbo
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None,
+ [],
True, False, '--allow-mixed-revisions',
A_COPY_H_path)
@@ -10974,7 +10886,7 @@ def dont_explicitly_record_implicit_merg
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Revert the previous merges and try a cherry harvest merge where
# the subtree's natural history is a proper subset of the merge.
@@ -11101,8 +11013,7 @@ def dont_explicitly_record_implicit_merg
expected_A_copy_disk,
expected_A_copy_status,
expected_A_copy_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
wc_status.add({'A_copy/D/H/nu' : Item(status=' ', wc_rev=8)})
wc_status.tweak('A_copy', wc_rev=8)
expected_output = wc.State(wc_dir, {
@@ -11206,8 +11117,7 @@ def dont_explicitly_record_implicit_merg
expected_A_copy_disk,
expected_A_copy_status,
expected_A_copy_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Test for issue where merging a change to a broken link fails
@@ -11432,8 +11342,7 @@ def subtree_merges_dont_intersect_with_t
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merging to the criterion 1 branch.
#
@@ -11506,8 +11415,7 @@ def subtree_merges_dont_intersect_with_t
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Test the notification portion of issue #3199.
#
@@ -11724,8 +11632,7 @@ def subtree_source_missing_in_requested_
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, True, False)
+ [], True, False)
# Revert the previous merge.
svntest.actions.run_and_verify_svn(None, [],
@@ -11790,8 +11697,7 @@ def subtree_source_missing_in_requested_
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, True, False)
+ [], True, False)
# As we did earlier, repeat the merge with the --record-only option to
# preserve the old behavior of recording mergeinfo on every subtree, thus
# allowing this test to actually test the issue #3067 fixes.
@@ -11870,8 +11776,7 @@ def subtree_source_missing_in_requested_
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, True, False)
+ [], True, False)
#----------------------------------------------------------------------
# Another test for issue #3067: 'subtrees that don't exist at the start
@@ -11926,7 +11831,7 @@ def subtrees_with_empty_mergeinfo(sbox):
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Test for issue #3240 'commits to subtrees added by merge
@@ -11998,7 +11903,7 @@ def commit_to_subtree_added_by_merge(sbo
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
expected_output = wc.State(wc_dir, {
'A_COPY/D/H' : Item(verb='Sending'),
'A_COPY/D/H/N' : Item(verb='Adding'),
@@ -12218,7 +12123,7 @@ def subtree_merges_dont_cause_spurious_c
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# run_and_verify_merge doesn't support merging to a file WCPATH
# so use run_and_verify_svn.
### TODO: We can use run_and_verify_merge() here now.
@@ -12333,7 +12238,7 @@ def subtree_merges_dont_cause_spurious_c
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 0)
+ check_props=True)
#----------------------------------------------------------------------
# Test for yet another variant of issue #3067.
@@ -12495,8 +12400,7 @@ def merge_target_and_subtrees_need_nonin
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Part of this test is a regression test for issue #3250 "Repeated merging
@@ -12740,8 +12644,7 @@ def merge_adds_mergeinfo_correctly(sbox)
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
wc_status.tweak('A_COPY',
'A_COPY/D/G/rho',
wc_rev=8)
@@ -12794,8 +12697,7 @@ def merge_adds_mergeinfo_correctly(sbox)
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
wc_status.tweak('A_COPY_2/D',
'A_COPY_2/D/H/omega',
wc_rev=9)
@@ -12874,8 +12776,7 @@ def merge_adds_mergeinfo_correctly(sbox)
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Revert and repeat the above merge, but this time create some
# uncommitted mergeinfo on A_COPY/D, this should not cause a write
@@ -12904,8 +12805,7 @@ def merge_adds_mergeinfo_correctly(sbox)
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -13103,8 +13003,7 @@ def natural_history_filtering(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
wc_status.tweak('A_COPY',
'A_COPY/B/E/beta',
'A_COPY/D/G/rho',
@@ -13192,8 +13091,7 @@ def natural_history_filtering(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -13271,7 +13169,7 @@ def subtree_gets_changes_even_if_ultimat
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 0,
+ [], True, False,
'-c3,7', H_COPY_path)
svntest.actions.run_and_verify_svn(
expected_merge_output([[-7]],
@@ -13320,7 +13218,7 @@ def subtree_gets_changes_even_if_ultimat
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1, 0)
+ [], True, False)
#----------------------------------------------------------------------
@SkipUnless(server_has_mergeinfo)
@@ -13468,8 +13366,7 @@ def no_self_referential_filtering_on_add
expected_A_COPY_2_disk,
expected_A_COPY_2_status,
expected_A_COPY_2_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Test for issue #3324
@@ -13674,8 +13571,7 @@ def merge_range_prior_to_rename_source_e
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0)
+ check_props=True)
svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
'Merge -r7:12 from A to A_COPY', wc_dir)
@@ -13804,8 +13700,7 @@ def merge_range_prior_to_rename_source_e
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
def set_up_natural_history_gap(sbox):
@@ -13978,8 +13873,7 @@ def dont_merge_gaps_in_history(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Test for issue #3432 'Merge can record mergeinfo from natural history
@@ -14073,8 +13967,7 @@ def handle_gaps_in_implicit_mergeinfo(sb
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Now reverse merge -r9:2 from 'A@HEAD' to 'A_COPY'. This should be
# a no-op since the only operative change made on 'A@HEAD' between r2:9
@@ -14096,8 +13989,7 @@ def handle_gaps_in_implicit_mergeinfo(sb
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Now merge all available revisions from 'A' to 'A_COPY'.
# The mergeinfo '/A:4' on 'A_COPY' should have no impact on this merge
@@ -14117,8 +14009,7 @@ def handle_gaps_in_implicit_mergeinfo(sb
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Test for issue #3323 'Mergeinfo deleted by a merge should disappear'
@@ -14238,8 +14129,7 @@ def mergeinfo_deleted_by_a_merge_should_
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# File merge optimization caused segfault during noop file merge
@@ -14571,7 +14461,7 @@ def record_only_merge(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1, 0,
+ [], True, False,
'--record-only', A2_path)
#----------------------------------------------------------------------
@@ -14665,13 +14555,12 @@ def merge_automatic_conflict_resolution(
expected_disk,
expected_status,
expected_skip,
- None,
- svntest.tree.detect_conflict_files,
- list(psi_conflict_support_files),
- None, None, 1, 1,
+ [], True, True,
'--accept', 'postpone',
'--allow-mixed-revisions',
- A_COPY_path)
+ A_COPY_path,
+ extra_files=
+ list(psi_conflict_support_files))
svntest.actions.run_and_verify_svn(None, [],
'revert', '--recursive', wc_dir)
@@ -14688,8 +14577,7 @@ def merge_automatic_conflict_resolution(
expected_disk,
expected_status,
expected_skip,
- None, None, None,
- None, None, 1, 0,
+ [], True, False,
'--accept', 'mine-conflict',
'--allow-mixed-revisions',
A_COPY_path)
@@ -14703,8 +14591,7 @@ def merge_automatic_conflict_resolution(
expected_disk,
expected_status,
expected_skip,
- None, None, None,
- None, None, 1, 0,
+ [], True, False,
'--accept', 'mine-full',
'--allow-mixed-revisions',
A_COPY_path)
@@ -14724,8 +14611,7 @@ def merge_automatic_conflict_resolution(
expected_disk,
expected_status,
expected_skip,
- None, None, None,
- None, None, 1, 0,
+ [], True, False,
'--accept', 'theirs-conflict',
'--allow-mixed-revisions',
A_COPY_path)
@@ -14739,8 +14625,7 @@ def merge_automatic_conflict_resolution(
expected_disk,
expected_status,
expected_skip,
- None, None, None,
- None, None, 1, 0,
+ [], True, False,
'--accept', 'theirs-full',
'--allow-mixed-revisions',
A_COPY_path)
@@ -14761,8 +14646,7 @@ def merge_automatic_conflict_resolution(
expected_disk,
expected_status,
expected_skip,
- None, None, None,
- None, None, 1, 0,
+ [], True, False,
'--accept', 'base',
'--allow-mixed-revisions',
A_COPY_path)
@@ -14881,8 +14765,7 @@ def skipped_files_get_correct_mergeinfo(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
# Test for issue #3115 'Case only renames resulting from merges don't
@@ -14968,8 +14851,7 @@ def committed_case_only_move_and_revert(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0)
+ [], True, False)
# Commit the merge
expected_output = svntest.wc.State(wc_dir, {
@@ -15036,8 +14918,7 @@ def committed_case_only_move_and_revert(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0,
+ [], True, False,
'--allow-mixed-revisions', A_COPY_path)
#----------------------------------------------------------------------
@@ -15148,8 +15029,7 @@ def merge_into_wc_for_deleted_branch(sbo
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0)
+ check_props=True)
#----------------------------------------------------------------------
def foreign_repos_del_and_props(sbox):
@@ -15298,8 +15178,8 @@ def immediate_depth_merge_creates_minima
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- 1, 1, '--depth', 'immediates',
+ [], True, True,
+ '--depth', 'immediates',
B_COPY_path)
#----------------------------------------------------------------------
@@ -15395,7 +15275,7 @@ def record_only_merge_creates_self_refer
expected_A_disk,
expected_A_status,
expected_A_skip,
- None, None, None, None, None, 1, 1,
+ [], True, True,
'--record-only', A_path)
#----------------------------------------------------------------------
@@ -15545,7 +15425,7 @@ def dav_skelta_mode_causes_spurious_conf
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, 1, 1)
+ [], True, True)
#----------------------------------------------------------------------
@@ -15589,8 +15469,8 @@ def merge_into_locally_added_file(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- True, True, new_path)
+ [], True, True,
+ new_path)
sbox.simple_commit()
#----------------------------------------------------------------------
@@ -15650,8 +15530,8 @@ def merge_into_locally_added_directory(s
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- True, True, new_dir_path)
+ [], True, True,
+ new_dir_path)
sbox.simple_commit()
#----------------------------------------------------------------------
@@ -15834,8 +15714,7 @@ def no_self_referential_or_nonexistent_i
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge all available revisions from A/D/J to A_COPY/D/J. Like the
# previous merge, the target should not have any non-existent ('/A/D/J:2-8')
@@ -15865,8 +15744,7 @@ def no_self_referential_or_nonexistent_i
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
#----------------------------------------------------------------------
# Test for issue #3756 'subtree merge can inherit invalid working mergeinfo',
@@ -16036,8 +15914,7 @@ def merge_change_to_file_with_executable
expected_disk,
expected_status,
expected_skip,
- None, None, None,
- None, None, True, True)
+ [], True, True)
# Verify the executable bit has been set
@@ -16145,8 +16022,8 @@ def dry_run_merge_conflicting_binary(sbo
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None,
- True, True, '--allow-mixed-revisions',
+ [], True, True,
+ '--allow-mixed-revisions',
other_wc)
#----------------------------------------------------------------------
@@ -16316,8 +16193,7 @@ def merge_adds_subtree_with_mergeinfo(sb
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, False)
+ check_props=True)
#----------------------------------------------------------------------
# A test for issue #3978 'reverse merge which adds subtree fails'.
@@ -16452,8 +16328,7 @@ def reverse_merge_adds_subtree(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
[... 92 lines stripped ...]