From 6f13c0d1e2927fc1c37991c82c8e4a49b6978851 Mon Sep 17 00:00:00 2001 From: glasser Date: Wed, 9 Apr 2008 22:53:19 +0000 Subject: [PATCH] Make a status test pass against old servers. * subversion/tests/cmdline/stat_tests.py (status_add_plus_conflict): Only look for a mergeinfo-modified line if the server would send it. git-svn-id: http://svn.collab.net/repos/svn/trunk@30470 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a --- subversion/tests/cmdline/stat_tests.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/subversion/tests/cmdline/stat_tests.py b/subversion/tests/cmdline/stat_tests.py index 5715cdb4f..8dd9fe59f 100755 --- a/subversion/tests/cmdline/stat_tests.py +++ b/subversion/tests/cmdline/stat_tests.py @@ -933,13 +933,16 @@ def status_add_plus_conflict(sbox): 'merge', branch_url, '-r', '4:5', trunk_dir) - expected_output = svntest.verify.UnorderedOutput([ + lines = [ "? " + os.path.join(wc_dir, "trunk", "file.merge-left.r4") + "\n", "? " + os.path.join(wc_dir, "trunk", "file.merge-right.r5") + "\n", "? " + os.path.join(wc_dir, "trunk", "file.working") + "\n", - " M " + os.path.join(wc_dir, "trunk") + "\n", "C + " + os.path.join(wc_dir, "trunk", "file") + "\n", - ]) + ] + if svntest.main.server_has_mergeinfo(): + lines.append(" M " + os.path.join(wc_dir, "trunk") + "\n") + + expected_output = svntest.verify.UnorderedOutput(lines) svntest.actions.run_and_verify_svn(None, expected_output, [], 'status', wc_dir) -- 2.11.4.GIT