You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/11/17 18:14:43 UTC
svn commit: r1640192 -
/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
Author: julianfoad
Date: Mon Nov 17 17:14:42 2014
New Revision: 1640192
URL: http://svn.apache.org/r1640192
Log:
On the 'move-tracking-2' branch: Add a basic test (or exercise, really) of
merging.
* subversion/tests/cmdline/svnmover_tests.py
(merges): New test.
Modified:
subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py?rev=1640192&r1=1640191&r2=1640192&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py Mon Nov 17 17:14:42 2014
@@ -105,6 +105,7 @@ def xtest_svnmover(repo_url, error_re_st
def basic_svnmover(sbox):
"basic svnmover tests"
+ # a copy of svnmucc_tests 1
sbox_build_svnmover(sbox)
@@ -308,6 +309,7 @@ def basic_svnmover(sbox):
def nested_replaces(sbox):
"nested replaces"
+ # a copy of svnmucc_tests 2
sbox_build_svnmover(sbox)
repo_url = sbox.repo_url
@@ -347,12 +349,73 @@ rm A/B/C/Y
svntest.actions.run_and_verify_svn(None, expected_output, [],
'log', '-qvr3', repo_url)
+def merges(sbox):
+ "merges"
+ sbox_build_svnmover(sbox)
+ repo_url = sbox.repo_url
+
+ # (r2)
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url,
+ 'mkdir', 'trunk', 'mkdir', 'branches',
+ 'mkdir', 'trunk/no_no',
+ 'mkdir', 'trunk/rm_no',
+ 'mkdir', 'trunk/no_rm',
+ 'mkdir', 'trunk/mv_no',
+ 'mkdir', 'trunk/no_mv',
+ 'mkdir', 'trunk/rm_mv',
+ 'mkdir', 'trunk/mv_rm')
+
+ # branchify (r3)
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url,
+ 'branchify', 'trunk')
+
+ # branch (r4)
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url,
+ 'branch', 'trunk', 'branches/br1')
+
+ # modify (r5, r6)
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url + '/trunk',
+ 'mkdir', 'add_no',
+ 'rm', 'rm_no',
+ 'rm', 'rm_mv',
+ 'mkdir', 'D1',
+ 'mv', 'mv_no', 'D1/mv_no',
+ 'mv', 'mv_rm', 'mv_rm_D1')
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url + '/branches/br1',
+ 'mkdir', 'no_add',
+ 'rm', 'no_rm',
+ 'rm', 'mv_rm',
+ 'mkdir', 'D2',
+ 'mv', 'no_mv', 'D2/no_mv_B',
+ 'mv', 'rm_mv', 'D2/rm_mv_B')
+
+ # a merge that makes no changes
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url,
+ 'merge', 'trunk', 'branches/br1', 'trunk@5')
+
+ # a merge that makes changes with no conflict
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url,
+ 'merge', 'branches/br1', 'trunk', 'trunk@5')
+
+ # a merge that makes changes, with conflicts
+ svntest.actions.run_and_verify_svnmover(None, [], svntest.verify.AnyOutput,
+ '-U', repo_url,
+ 'merge', 'trunk@6', 'branches/br1', 'trunk@3')
+
######################################################################
test_list = [ None,
basic_svnmover,
nested_replaces,
+ merges,
]
if __name__ == '__main__':