diff options
Diffstat (limited to 'subversion/tests/cmdline/update_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/update_tests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/subversion/tests/cmdline/update_tests.py b/subversion/tests/cmdline/update_tests.py index 2805081..fa6d0d7 100755 --- a/subversion/tests/cmdline/update_tests.py +++ b/subversion/tests/cmdline/update_tests.py @@ -480,7 +480,7 @@ def update_to_rev_zero(sbox): def receive_overlapping_same_change(sbox): "overlapping identical changes should not conflict" - ### (See http://subversion.tigris.org/issues/show_bug.cgi?id=682.) + ### (See https://issues.apache.org/jira/browse/SVN-682.) ### ### How this test works: ### @@ -3046,13 +3046,12 @@ def mergeinfo_update_elision(sbox): # Make a branch A/B_COPY expected_stdout = verify.UnorderedOutput([ - "A " + sbox.ospath('A/B_COPY/lambda') + "\n", - "A " + sbox.ospath('A/B_COPY/E') + "\n", - "A " + sbox.ospath('A/B_COPY/E/alpha') + "\n", - "A " + sbox.ospath('A/B_COPY/E/beta') + "\n", - "A " + sbox.ospath('A/B_COPY/F') + "\n", - "Checked out revision 1.\n", "A " + B_COPY_path + "\n", + "A " + sbox.ospath('A/B_COPY/lambda') + "\n", + "A " + sbox.ospath('A/B_COPY/E') + "\n", + "A " + sbox.ospath('A/B_COPY/E/alpha') + "\n", + "A " + sbox.ospath('A/B_COPY/E/beta') + "\n", + "A " + sbox.ospath('A/B_COPY/F') + "\n", ]) svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy', sbox.repo_url + "/A/B", B_COPY_path) @@ -6719,6 +6718,7 @@ def update_conflict_details(sbox): # Keywords should be updated in local file even if text change is shortcut # (due to the local change being the same as the incoming change, for example). @XFail() +@Issue(4585) def update_keywords_on_shortcut(sbox): "update_keywords_on_shortcut" |