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 2010/11/16 18:35:59 UTC
svn commit: r1035704 -
/subversion/branches/issue-3668-3669/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Tue Nov 16 17:35:59 2010
New Revision: 1035704
URL: http://svn.apache.org/viewvc?rev=1035704&view=rev
Log:
On the issue-3668-3669 branch: One final test tweak.
* subversion/tests/cmdline/merge_tests.py
(merge_target_and_subtrees_need_nonintersecting_ranges): Manually propset
some mergeinfo in this test's setup to mimic pre-1.7 behavior, see
http://subversion.tigris.org/issues/show_bug.cgi?id=3669#desc8
Modified:
subversion/branches/issue-3668-3669/subversion/tests/cmdline/merge_tests.py
Modified: subversion/branches/issue-3668-3669/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/tests/cmdline/merge_tests.py?rev=1035704&r1=1035703&r2=1035704&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/issue-3668-3669/subversion/tests/cmdline/merge_tests.py Tue Nov 16 17:35:59 2010
@@ -12804,6 +12804,13 @@ def merge_target_and_subtrees_need_nonin
None, expected_merge_output([[8]], ['U ' + nu_COPY_path + '\n',
' G ' + nu_COPY_path + '\n']),
[], 'merge', '-c8', sbox.repo_url + '/A/D/G/nu', nu_COPY_path)
+ # Replicate pre 1.7 merge behavior where self-referential mergeinfo
+ # could be inherited, this keeps the original intent of this test intact,
+ # see http://subversion.tigris.org/issues/show_bug.cgi?id=3669#desc8
+ svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+ SVN_PROP_MERGEINFO, '/A/D/G/nu:2-8',
+ nu_COPY_path)
+
svntest.actions.run_and_verify_svn(
None, expected_merge_output([[-6]], ['G ' + omega_COPY_path + '\n',
' G ' + omega_COPY_path + '\n']),