Author: julianfoad
Date: Mon Nov 24 15:37:29 2014
New Revision: 1641410
URL: http://svn.apache.org/r1641410
Log:
On the 'move-tracking-2' branch: Tweak the merging test.
* subversion/tests/cmdline/svnmover_tests.py
(merges): Don't use 'branchify' except to create an initial branch.
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=1641410&r1=1641409&r2=1641410&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 24 15:37:29 2014
@@ -354,10 +354,20 @@ def merges(sbox):
sbox_build_svnmover(sbox)
repo_url = sbox.repo_url
+ # make a 'trunk' branch and a 'branches' directory
# (r2)
svntest.actions.run_and_verify_svnmover(None, None, [],
'-U', repo_url,
- 'mkdir', 'trunk', 'mkdir', 'branches',
+ 'mkdir', 'trunk',
+ 'branchify', 'trunk',
+ 'mkdir', 'branches')
+
+ # Create some nodes in trunk, each one named for how we will modify it.
+ # The name 'rm_no', for example, means we are going to 'rm' this node on
+ # trunk and make 'no' change on the branch.
+ # (r3)
+ svntest.actions.run_and_verify_svnmover(None, None, [],
+ '-U', repo_url,
'mkdir', 'trunk/no_no',
'mkdir', 'trunk/rm_no',
'mkdir', 'trunk/no_rm',
@@ -366,11 +376,6 @@ def merges(sbox):
'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,
