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 2011/02/09 23:19:11 UTC
svn commit: r1069145 -
/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: pburba
Date: Wed Feb 9 22:19:10 2011
New Revision: 1069145
URL: http://svn.apache.org/viewvc?rev=1069145&view=rev
Log:
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(merge_replace_causes_tree_conflict2): Tweak expected output to include
new 1.7 mergeinfo notifications.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1069145&r1=1069144&r2=1069145&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Wed Feb 9 22:19:10 2011
@@ -1830,6 +1830,9 @@ def merge_replace_causes_tree_conflict2(
expected_stdout = verify.UnorderedOutput([
"--- Merging differences between repository URLs into '" + A_B + "':\n",
' C ' + A_B_E + '\n',
+ "--- Recording mergeinfo for merge between repository URLs into '" +
+ A_B + "':\n",
+ " U " + A_B + "\n",
'Summary of conflicts:\n',
' Tree conflicts: 1\n',
])
@@ -1841,6 +1844,10 @@ def merge_replace_causes_tree_conflict2(
expected_stdout = verify.UnorderedOutput([
"--- Merging differences between repository URLs into '" + A_D + "':\n",
' C ' + A_D_H + '\n',
+ "--- Recording mergeinfo for merge between repository URLs into '" +
+ A_D + "':\n",
+ " U " + A_D + "\n",
+ " U " + A_D_G + "\n",
'Summary of conflicts:\n',
' Tree conflicts: 1\n',
])
@@ -1853,6 +1860,13 @@ def merge_replace_causes_tree_conflict2(
"--- Merging differences between repository URLs into '" + A_D_G +
"':\n",
' C ' + A_D_G_pi + '\n',
+ "--- Recording mergeinfo for merge between repository URLs into '" +
+ A_D_G + "':\n",
+ "--- Eliding mergeinfo from '" + A_D_G_pi + "':\n",
+ " U " + A_D_G_pi + "\n",
+ "--- Eliding mergeinfo from '" + A_D_G_pi + "':\n",
+ " U " + A_D_G_pi + "\n",
+ " G " + A_D_G + "\n",
'Summary of conflicts:\n',
' Tree conflicts: 1\n',
])