svn commit: r1147056 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

[ph...@apache.org]

Author: philip
Date: Fri Jul 15 09:35:32 2011
New Revision: 1147056

URL: http://svn.apache.org/viewvc?rev=1147056&view=rev
Log:
* subversion/tests/cmdline/merge_reintegrate_tests.py
  (no_source_subtree_mergeinfo): Check that the subtree has no mergeinfo.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1147056&r1=1147055&r2=1147056&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Fri Jul 15 09:35:32 2011
@@ -2417,11 +2417,19 @@ def no_source_subtree_mergeinfo(sbox):
   svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
   svntest.main.run_svn(None, 'update', wc_dir)
 
+  # Verify that merge results in no subtree mergeinfo
+  svntest.actions.run_and_verify_svn(None, [], [], 'propget', 'svn:mergeinfo',
+                                     sbox.repo_url + '/A/B2/E')
+
   # Merge trunk to branch-2
   svntest.main.run_svn(None, 'merge', '^/A/B', os.path.join(wc_dir, 'A', 'B2'))
   svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
   svntest.main.run_svn(None, 'update', wc_dir)
 
+  # Verify that there is still no subtree mergeinfo
+  svntest.actions.run_and_verify_svn(None, [], [], 'propget', 'svn:mergeinfo',
+                                     sbox.repo_url + '/A/B2/E')
+
   # Reintegrate branch-2 to trunk, this fails in 1.6.x from 1.6.13.
   # The error message states revisions /A/B/E:3-11 are missing from
   # /A/B2/E and yet the mergeinfo on /A/B2 is /A/B:3-11 and /A/B2/E