svn commit: r1442785 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

[pb...@apache.org]

Author: pburba
Date: Tue Feb  5 23:00:10 2013
New Revision: 1442785

URL: http://svn.apache.org/viewvc?rev=1442785&view=rev
Log:
Expand test coverage for issue #4138 'replacement in merge source not
notified correctly'.

* subversion/tests/cmdline/merge_tests.py
  (merge_source_with_replacement): Check the resulting mergeinfo in addition
   to the merge notifications.  The notifications are still wrong (a minor
   problem) but the mergeinfo is wrong now too -- see
   http://subversion.tigris.org/issues/show_bug.cgi?id=4138#desc4

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1442785&r1=1442784&r2=1442785&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Feb  5 23:00:10 2013
@@ -17495,6 +17495,13 @@ def merge_source_with_replacement(sbox):
                                      'merge', sbox.repo_url + '/A',
                                      A_COPY_path)
 
+  # Misleading notifications are one thing, incorrect mergeinfo is quite
+  # another.
+  svntest.actions.run_and_verify_svn(None,
+                                     [A_COPY_path + ' - /A:2-5,7-8\n'],
+                                     [], 'pg', SVN_PROP_MERGEINFO,
+                                     '-R', A_COPY_path)
+
 #----------------------------------------------------------------------
 # Test for issue #4144 'Reverse merge with replace in source applies
 # diffs in forward order'.