Author: pburba
Date: Tue Nov 22 21:59:59 2011
New Revision: 1205188
URL: http://svn.apache.org/viewvc?rev=1205188&view=rev
Log:
* subversion/tests/cmdline/mergeinfo_tests.py
(noninheritabled_mergeinfo_not_always_eligible): Tweak test for
issue #4050 to ensure it never spuriously passes if issue #3057 is
ever fixed.
Modified:
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=1205188&r1=1205187&r2=1205188&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Tue Nov 22
21:59:59 2011
@@ -709,6 +709,13 @@ def noninheritabled_mergeinfo_not_always
'-c3', '--depth=empty')
svntest.main.run_svn(None, 'commit', '-m', 'shallow merge', wc_dir)
+ # A sanity check that we really have non-inheritable mergeinfo.
+ # If issue #4057 is ever fixed then the above merge will record
+ # inheritable mergeinfo and this test will spuriously pass.
+ svntest.actions.run_and_verify_svn(None, ["/A:3*\n"], [],
+ 'propget', SVN_PROP_MERGEINFO,
+ branch_path)
+
# Now check that r3 is reported as fully merged from ^/A to ^/branch
# and does not show up all when asking for eligible revs.
#
