You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/19 21:01:35 UTC
svn commit: r1148486 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_client/merge.c
subversion/tests/cmdline/merge_reintegrate_tests.py
Author: hwright
Date: Tue Jul 19 19:01:34 2011
New Revision: 1148486
URL: http://svn.apache.org/viewvc?rev=1148486&view=rev
Log:
Merge r1146121, r1146870 from trunk:
* r1146121, r1146870
Fix issue #3957 'reintegrate fails with no subtree mergeinfo on source'.
Justification:
Fixes an obvious bug in the issue #3242 fix (r1146870), albeit a bug
with no readily apparent manifestation on 1.7.x.
Notes:
r1146121 is a test, r1146870 is the fix. The new test only failed on
1.6.x. It doesn't fail on 1.7.x because of other changes in 1.7 which
make reintegrate merges more tolerant of subtree mergeinfo, see
http://subversion.tigris.org/issues/show_bug.cgi?id=3957#desc8
Votes:
+1: pburba, rhuijben, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_client/merge.c
subversion/branches/1.7.x/subversion/tests/cmdline/merge_reintegrate_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 19 19:01:34 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146899,1146904,1147293,1147309
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1148486&r1=1148485&r2=1148486&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Jul 19 19:01:34 2011
@@ -66,19 +66,6 @@ Candidate changes:
Approved changes:
=================
- * r1146121, r1146870
- Fix issue #3957 'reintegrate fails with no subtree mergeinfo on source'.
- Justification:
- Fixes an obvious bug in the issue #3242 fix (r1146870), albeit a bug
- with no readily apparent manifestation on 1.7.x.
- Notes:
- r1146121 is a test, r1146870 is the fix. The new test only failed on
- 1.6.x. It doesn't fail on 1.7.x because of other changes in 1.7 which
- make reintegrate merges more tolerant of subtree mergeinfo, see
- http://subversion.tigris.org/issues/show_bug.cgi?id=3957#desc8
- Votes:
- +1: pburba, rhuijben, philip
-
* r1148071
Don't needlessly reparent a RA session to the repository root.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/merge.c?rev=1148486&r1=1148485&r2=1148486&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/merge.c Tue Jul 19 19:01:34 2011
@@ -10035,7 +10035,8 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
FALSE, FALSE,
iterpool));
if (subtree_catalog)
- source_mergeinfo = apr_hash_get(subtree_catalog, source_path,
+ source_mergeinfo = apr_hash_get(subtree_catalog,
+ source_path_rel_to_session,
APR_HASH_KEY_STRING);
/* A path might not have any inherited mergeinfo either. */
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1148486&r1=1148485&r2=1148486&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/merge_reintegrate_tests.py Tue Jul 19 19:01:34 2011
@@ -2340,6 +2340,131 @@ def reintegrate_creates_bogus_mergeinfo(
None, None, None, None, None,
1, 1, "--reintegrate", A_path)
+
+#----------------------------------------------------------------------
+# Test for regression on 1.6.x branch, merge fails when source without
+# subtree mergeinfo is reintegrated into a target with subtree
+# mergeinfo. Deliberately written in a style that works with the 1.6
+# testsuite.
+@Issue(3957)
+def no_source_subtree_mergeinfo(sbox):
+ "source without subtree mergeinfo"
+
+ sbox.build()
+ wc_dir=sbox.wc_dir
+
+ svntest.main.file_write(os.path.join(wc_dir, 'A', 'B', 'E', 'alpha'),
+ 'AAA\n' +
+ 'BBB\n' +
+ 'CCC\n')
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+ svntest.main.run_svn(None, 'update', wc_dir)
+
+ # Create branch-1
+ svntest.main.run_svn(None, 'copy',
+ os.path.join(wc_dir, 'A', 'B'),
+ os.path.join(wc_dir, 'A', 'B1'))
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+
+ # Create branch-1
+ svntest.main.run_svn(None, 'copy',
+ os.path.join(wc_dir, 'A', 'B'),
+ os.path.join(wc_dir, 'A', 'B2'))
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+
+ # Change on trunk
+ svntest.main.file_write(os.path.join(wc_dir, 'A', 'B', 'E', 'alpha'),
+ 'AAAxx\n' +
+ 'BBB\n' +
+ 'CCC\n')
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+
+ # Change on branch-1
+ svntest.main.file_write(os.path.join(wc_dir, 'A', 'B1', 'E', 'alpha'),
+ 'AAA\n' +
+ 'BBBxx\n' +
+ 'CCC\n')
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+
+ # Change on branch-2
+ svntest.main.file_write(os.path.join(wc_dir, 'A', 'B2', 'E', 'alpha'),
+ 'AAA\n' +
+ 'BBB\n' +
+ 'CCCxx\n')
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+ svntest.main.run_svn(None, 'update', wc_dir)
+
+ # Merge trunk to branch-1
+ svntest.main.run_svn(None, 'merge', '^/A/B', os.path.join(wc_dir, 'A', 'B1'))
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+ svntest.main.run_svn(None, 'update', wc_dir)
+
+ # Reintegrate branch-1 subtree to trunk subtree
+ svntest.main.run_svn(None, 'merge', '--reintegrate',
+ '^/A/B1/E', os.path.join(wc_dir, 'A', 'B', 'E'))
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+ svntest.main.run_svn(None, 'update', wc_dir)
+
+ # 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)
+
+ # Reverse merge branch-1 subtree to branch-2 subtree, this removes
+ # the subtree mergeinfo from branch 2
+ svntest.main.run_svn(None, 'merge', '-r8:2',
+ '^/A/B1/E', os.path.join(wc_dir, 'A', 'B2', 'E'))
+ svntest.main.run_svn(None, 'commit', '-m', 'log message', wc_dir)
+ svntest.main.run_svn(None, 'update', wc_dir)
+
+ # 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)
+
+ # 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
+ # has no mergeinfo.
+ expected_output = wc.State(os.path.join(wc_dir, 'A', 'B'), {
+ 'E' : Item(status=' U'),
+ 'E/alpha' : Item(status='U '),
+ })
+ expected_mergeinfo = wc.State(os.path.join(wc_dir, 'A', 'B'), {
+ '' : Item(status=' U'),
+ })
+ expected_elision = wc.State(os.path.join(wc_dir, 'A', 'B'), {
+ })
+ expected_disk = wc.State('', {
+ '' : Item(props={SVN_PROP_MERGEINFO : '/A/B2:3-12'}),
+ 'E' : Item(),
+ 'E/alpha' : Item("AAA\n" +
+ "BBB\n" +
+ "CCCxx\n"),
+ 'E/beta' : Item("This is the file 'beta'.\n"),
+ 'F' : Item(),
+ 'lambda' : Item("This is the file 'lambda'.\n"),
+ })
+ expected_skip = wc.State(os.path.join(wc_dir, 'A', 'B'), {
+ })
+ svntest.actions.run_and_verify_merge(os.path.join(wc_dir, 'A', 'B'),
+ None, None, '^/A/B2', None,
+ expected_output, expected_mergeinfo,
+ expected_elision, expected_disk,
+ None, expected_skip,
+ None, None, None, None, None,
+ 1, 1, '--reintegrate',
+ os.path.join(wc_dir, 'A', 'B'))
+ # For 1.6 testsuite use:
+ # svntest.actions.run_and_verify_merge(os.path.join(wc_dir, 'A', 'B'),
+ # None, None, '^/A/B2',
+ # expected_output,
+ # expected_disk,
+ # None, expected_skip,
+ # None, None, None, None, None,
+ # 1, 1, '--reintegrate')
+
+
########################################################################
# Run the tests
@@ -2361,6 +2486,7 @@ test_list = [ None,
added_subtrees_with_mergeinfo_break_reintegrate,
two_URL_merge_removes_valid_mergeinfo_from_target,
reintegrate_creates_bogus_mergeinfo,
+ no_source_subtree_mergeinfo,
]
if __name__ == '__main__':