diff options
| author | James McCoy <jamessan@debian.org> | 2018-10-02 21:49:53 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2018-10-02 21:49:53 -0400 |
| commit | db2274467e932f2ac8f15a9372bbe32aa4fdfeb1 (patch) | |
| tree | 496bc44d76075f2da22340a109fb63129806a646 /subversion/tests/cmdline/merge_reintegrate_tests.py | |
| parent | e20a507113ff1126aeb4a97b806390ea377fe292 (diff) | |
New upstream version 1.11.0~rc2
Diffstat (limited to 'subversion/tests/cmdline/merge_reintegrate_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/merge_reintegrate_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/tests/cmdline/merge_reintegrate_tests.py b/subversion/tests/cmdline/merge_reintegrate_tests.py index 7a27373..1479400 100755 --- a/subversion/tests/cmdline/merge_reintegrate_tests.py +++ b/subversion/tests/cmdline/merge_reintegrate_tests.py @@ -1363,7 +1363,7 @@ def reintegrate_with_subtree_mergeinfo(sbox): # how can any prop changes be merged to it? The answer is that # the merge code does some quiet housekeeping, merging gamma_moved's # inherited mergeinfo into its incoming mergeinfo, see - # http://subversion.tigris.org/issues/show_bug.cgi?id=4309 + # https://issues.apache.org/jira/browse/SVN-4309 # This test is not covering issue #4309 so we let the current # behavior pass. # r17 - B) Synch merge from A to A_COPY |