You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2012/08/01 00:19:33 UTC
svn commit: r1367803 -
/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
Author: pburba
Date: Tue Jul 31 22:19:33 2012
New Revision: 1367803
URL: http://svn.apache.org/viewvc?rev=1367803&view=rev
Log:
* subversion/tests/cmdline/merge_symmetric_tests.py
(subtree_to_and_fro): Commit the subtree merge alone, rather than as
part of a subsequent trunk edit. No important effect on the test, it
just changes the youngest revision expected in the merge headers.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py?rev=1367803&r1=1367802&r2=1367803&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Tue Jul 31 22:19:33 2012
@@ -785,6 +785,8 @@ def subtree_to_and_fro(sbox):
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'merge', '--symmetric',
sbox.repo_url + '/A/D', A_COPY_D_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+ '-m', 'Symmetric subtree merge')
# r9 - Make an edit to A/D/H/psi.
svntest.main.file_write(psi_path, "Trunk Edit to 'psi'.\n")
@@ -816,10 +818,10 @@ def subtree_to_and_fro(sbox):
# Select: (p) postpone, (df) diff-full, (e) edit,
# (mc) mine-conflict, (tc) theirs-conflict,
# (s) show all options: p
- # --- Merging r2 through r8 into 'A':
+ # --- Merging r2 through r9 into 'A':
# C A\D\H\psi
# U A\D\gamma
- # --- Recording mergeinfo for merge of r2 through r8 into 'A':
+ # --- Recording mergeinfo for merge of r2 through r9 into 'A':
# U A
# Summary of conflicts:
# Text conflicts: 1
@@ -834,7 +836,7 @@ def subtree_to_and_fro(sbox):
"in the way expected",
err, None,
"(svn: E195016: Reintegrate can only be used if "
- "revisions 2 through 8 were previously "
+ "revisions 2 through 9 were previously "
"merged from .*/A to the reintegrate source, "
"but this is not the case:\n)"
"|( A_COPY\n)"