svn commit: r1336559 - /subversion/trunk/subversion/tests/cmdline/log_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Thu May 10 09:32:19 2012
New Revision: 1336559

URL: http://svn.apache.org/viewvc?rev=1336559&view=rev
Log:
Adjust a test subroutine (shared by several tests) to avoid using a sync
merge that produces conflicts in a case where both a 'reintegrate' and the new
symmetric merge would do the right thing without conflicts.  This avoids
spurious test failures when testing the symmetric merge, and doesn't affect
the tests that use this subroutine.

* subversion/tests/cmdline/log_tests.py
  (merge_history_repos): Do the last merge as a straightforward reintegrate instead of doing
    a sync merge, expecting conflicts, and resolving them.

Modified:
    subversion/trunk/subversion/tests/cmdline/log_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1336559&r1=1336558&r2=1336559&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Thu May 10 09:32:19 2012
@@ -391,25 +391,16 @@ def merge_history_repos(sbox):
   svntest.main.run_svn(None, 'ci', '-m',
                        "Modify 'mu' on branches/c.")
 
-  # Merge branches/c to trunk, which produces a conflict - r17
+  # Merge branches/c to trunk - r17
   #
   # Mergeinfo changes on /trunk:
   #    Merged /branches/c:r5-16
   os.chdir('trunk')
-  svntest.main.run_svn(None, 'merge', '--allow-mixed-revisions',
+  svntest.main.run_svn(None, 'up')
+  svntest.main.run_svn(None, 'merge', '--reintegrate',
                        os.path.join('..', branch_c) + '@HEAD')
-  svntest.main.file_write(os.path.join('A', 'mu'),
-                          "This is the file 'mu'.\n" +
-                          "Don't forget to look at 'upsilon', as well.\n" +
-                          "This is yet more content in 'mu'.",
-                          "wb")
-  # Resolve conflicts, and commit
-  svntest.actions.run_and_verify_resolved([os.path.join('A', 'mu'),
-                                           os.path.join('A', 'xi'),
-                                           os.path.join('A', 'upsilon')])
   svntest.main.run_svn(None, 'ci', '-m',
-                       "Merge branches/c to trunk, " +
-                       "resolving a conflict in 'mu'.",
+                       "Merge branches/c to trunk.",
                        '--username', svntest.main.wc_author2)
   os.chdir('..')