subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r917660 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Date Mon, 01 Mar 2010 19:24:43 GMT
Author: pburba
Date: Mon Mar  1 19:24:42 2010
New Revision: 917660

URL: http://svn.apache.org/viewvc?rev=917660&view=rev
Log:
Modify an exiting merge test to also cover issue #3591 'reintegrate merges
update subtree mergeinfo unconditionally'.

* subversion/tests/cmdline/merge_tests.py

  (reintegrate_with_self_referential_mergeinfo): Change expectations of
   reintegrate merge such that subtrees with explicit mergeinfo, which are
   not affected by the merge, don't have their mergeinfo updated.

  (test_list): Mark reintegrate_with_self_referential_mergeinfo as XFail.

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=917660&r1=917659&r2=917660&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Mar  1 19:24:42 2010
@@ -18545,8 +18545,10 @@
 
 # Test for a reintegrate bug which can occur when the merge source
 # has mergeinfo that explicitly describes common history with the reintegrate
-# target, see http://mail-archives.apache.org/mod_mbox/subversion-dev/
-# 200912.mbox/%3C6cfe18eb0912161438wfb5234bj118aacdff7ffb25f@mail.gmail.com%3E
+# target, see http://svn.haxx.se/dev/archive-2009-12/0338.shtml
+#
+# Also tests Issue #3591 'reintegrate merges update subtree mergeinfo
+# unconditionally'.
 def reintegrate_with_self_referential_mergeinfo(sbox):
   "source has target's history as explicit mergeinfo"
 
@@ -18593,23 +18595,22 @@
                                      '-m', 'Work done on the A2.1 branch.',
                                      wc_dir)
   
-  # Update to uniform revision and reintegrated A2.1 back to A2.
+  # Update to uniform revision and reintegrate A2.1 back to A2.
+  # Note that the mergeinfo on A2/B is not changed by the reintegration
+  # and so is not expected to by updated to describe the merge.
   svntest.actions.run_and_verify_svn(None, ["At revision 8.\n"], [],
                                      'up', wc_dir)
-
-  # Now merge all available revisions from A to A_COPY:
   expected_output = wc.State(A2_path, {
     'mu' : Item(status='U '),
     })
   expected_mergeinfo_output = wc.State(A2_path, {
     ''  : Item(status=' U'),
-    'B' : Item(status=' U'),
     })
   expected_elision_output = wc.State(A2_path, {
     })
   expected_status = wc.State(A2_path, {
     ''          : Item(status=' M'),
-    'B'         : Item(status=' M'),
+    'B'         : Item(status='  '),
     'mu'        : Item(status='M '),
     'B/E'       : Item(status='  '),
     'B/E/alpha' : Item(status='  '),
@@ -18631,7 +18632,7 @@
   expected_status.tweak(wc_rev=8)
   expected_disk = wc.State('', {
     ''          : Item(props={SVN_PROP_MERGEINFO : '/A:3\n/A2.1:7-8'}),
-    'B'         : Item(props={SVN_PROP_MERGEINFO : '/A/B:4\n/A2.1/B:7-8'}),
+    'B'         : Item(props={SVN_PROP_MERGEINFO : '/A/B:4'}),
     'mu'        : Item("New A2.1 stuff"),
     'B/E'       : Item(),
     'B/E/alpha' : Item("This is the file 'alpha'.\n"),
@@ -18664,6 +18665,9 @@
   #  ..\..\..\subversion\libsvn_fs_fs\tree.c:2886: (apr_err=160013)
   #  ..\..\..\subversion\libsvn_fs_fs\tree.c:669: (apr_err=160013)
   #  svn: File not found: revision 4, path '/A2'
+  #
+  # This currently fails because the mergeinfo on A2/B gets updated, even
+  # though no paths within that subtree are affected by the reintegration.
   svntest.actions.run_and_verify_merge(A2_path, None, None,
                                        sbox.repo_url + '/A2.1', None,
                                        expected_output,
@@ -19033,7 +19037,7 @@
               XFail(committed_case_only_move_and_revert,
                     is_fs_case_insensitive),
               merge_into_wc_for_deleted_branch,
-              reintegrate_with_self_referential_mergeinfo,
+              XFail(reintegrate_with_self_referential_mergeinfo),
               reintegrate_with_subtree_merges,
              ]
 



Mime
View raw message