diff options
Diffstat (limited to 'subversion/tests/cmdline/svnmover_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/svnmover_tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subversion/tests/cmdline/svnmover_tests.py b/subversion/tests/cmdline/svnmover_tests.py index bfdbb1f..6c98b64 100755 --- a/subversion/tests/cmdline/svnmover_tests.py +++ b/subversion/tests/cmdline/svnmover_tests.py @@ -469,7 +469,7 @@ rm A/B/C/Y ' D /top0/A/B/C/Y', ])) expected_output = svntest.verify.UnorderedRegexListOutput(escaped - + ['^-', '^r2', '^-', '^Changed paths:',]) + + ['^--*', '^r2.*', '^--*', '^Changed paths:',]) svntest.actions.run_and_verify_svn(expected_output, [], 'log', '-qvr2', repo_url) @@ -755,7 +755,7 @@ def simple_moves_within_a_branch(sbox): 'mv lib/foo/y2 y2') # move and rename, dir with children test_svnmover2(sbox, '/trunk', - reported_br_diff('') + + reported_br_diff('trunk') + reported_add('subdir') + reported_move('lib', 'subdir/lib2'), 'mkdir subdir', @@ -765,7 +765,7 @@ def simple_moves_within_a_branch(sbox): # moves and renames together # (put it all back to how it was, in one commit) test_svnmover2(sbox, '/trunk', - reported_br_diff('') + + reported_br_diff('trunk') + reported_move('subdir/lib2/README.txt', 'README') + reported_move('subdir/lib2', 'lib') + reported_move('y2', 'lib/foo/y') + |