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 2011/08/25 22:27:10 UTC
svn commit: r1161735 - in /subversion/branches/1.7.x-issue3976: ./
subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Thu Aug 25 20:27:09 2011
New Revision: 1161735
URL: http://svn.apache.org/viewvc?rev=1161735&view=rev
Log:
On the 1.7.x-issue-3976 branch: Merge r1161683 from ^/subversion/trunk.
Resolve some minor conflicts with test ordering.
Modified:
subversion/branches/1.7.x-issue3976/ (props changed)
subversion/branches/1.7.x-issue3976/subversion/tests/cmdline/merge_tests.py
Propchange: subversion/branches/1.7.x-issue3976/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 20:27:09 2011
@@ -61,4 +61,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,115
8193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161080,1161185
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,115
8193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161080,1161185,1161683
Modified: subversion/branches/1.7.x-issue3976/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue3976/subversion/tests/cmdline/merge_tests.py?rev=1161735&r1=1161734&r2=1161735&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue3976/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.7.x-issue3976/subversion/tests/cmdline/merge_tests.py Thu Aug 25 20:27:09 2011
@@ -17040,6 +17040,94 @@ def merge_adds_subtree_with_mergeinfo(sb
None, None, None, None,
None, 1, False)
+#----------------------------------------------------------------------
+# A test for issue #3976 'record-only merges which add new subtree mergeinfo
+# don't record mergeinfo describing merge'.
+@Issue(3976)
+@XFail()
+@SkipUnless(server_has_mergeinfo)
+def record_only_merge_adds_new_subtree_mergeinfo(sbox):
+ "record only merge adds new subtree mergeinfo"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ wc_disk, wc_status = set_up_branch(sbox)
+
+ psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
+ psi_COPY_path = os.path.join(wc_dir, 'A_COPY', 'D', 'H', 'psi')
+ H_COPY2_path = os.path.join(wc_dir, 'A_COPY_2', 'D', 'H')
+
+ # r7 - Copy ^/A_COPY to ^/A_COPY_2
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'copy', '-m', 'copy A_COPY to A_COPY_2',
+ sbox.repo_url + '/A_COPY',
+ sbox.repo_url + '/A_COPY_2')
+
+ # r8 - Set a property on A/D/H/psi. It doesn't matter what property
+ # we use, just as long as we have a change that can be merged independently
+ # of the text change to A/D/H/psi in r3.
+ svntest.main.run_svn(None, 'propset', 'svn:eol-style', 'native', psi_path)
+ svntest.main.run_svn(None, 'commit', '-m', 'set svn:eol-style', wc_dir)
+
+ # r9 - Merge r3 from ^/A/D/H/psi to A_COPY/D/H/psi.
+ svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ sbox.repo_url + '/A/D/H/psi',
+ psi_COPY_path, '-c3')
+ svntest.main.run_svn(None, 'commit', '-m', 'Subtree merge', wc_dir)
+
+ # r10 - Merge r8 from ^/A/D/H/psi to A_COPY/D/H/psi.
+ svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+ sbox.repo_url + '/A/D/H/psi',
+ psi_COPY_path, '-c8')
+ svntest.main.run_svn(None, 'commit', '-m', 'Subtree merge', wc_dir)
+
+ # Merge r10 from ^/A_COPY/D/H to A_COPY_2/D/H. This should leave
+ # A_COPY_2/D/H/psi with three new property changes:
+ #
+ # 1) The 'svn:eol-style=native' from r10 via r8.
+ #
+ # 2) The mergeinfo '/A/D/H/psi:8' from r10.
+ #
+ # 3) The mergeinfo '/A_COPY/D/H/psi:10' describing the merge itself.
+ #
+ # Currently this test fails because #3 doesn't happen.
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ expected_output = wc.State(H_COPY2_path, {
+ 'psi' : Item(status=' U'),
+ })
+ expected_mergeinfo_output = wc.State(H_COPY2_path, {
+ '' : Item(status=' U'),
+ 'psi' : Item(status=' G'),
+ })
+ expected_elision_output = wc.State(H_COPY2_path, {})
+ expected_status = wc.State(H_COPY2_path, {
+ '' : Item(status=' M'),
+ 'chi' : Item(status=' '),
+ 'psi' : Item(status=' M'),
+ 'omega' : Item(status=' '),
+ })
+ expected_status.tweak(wc_rev=10)
+ expected_disk = wc.State('', {
+ '' : Item(props={SVN_PROP_MERGEINFO : '/A_COPY/D/H:10'}),
+ 'psi' : Item("This is the file 'psi'.\n",
+ props={SVN_PROP_MERGEINFO :
+ '/A/D/H/psi:8\n/A_COPY/D/H/psi:10',
+ 'svn:eol-style' : 'native'}),
+ 'chi' : Item("This is the file 'chi'.\n"),
+ 'omega' : Item("This is the file 'omega'.\n"),
+ })
+ expected_skip = wc.State('.', { })
+ svntest.actions.run_and_verify_merge(H_COPY2_path, 9, 10,
+ sbox.repo_url + '/A_COPY/D/H', None,
+ expected_output,
+ expected_mergeinfo_output,
+ expected_elision_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, None, None, None,
+ None, 1, False)
+
########################################################################
# Run the tests
@@ -17167,6 +17255,7 @@ test_list = [ None,
reverse_merge_adds_subtree,
merged_deletion_causes_tree_conflict,
merge_adds_subtree_with_mergeinfo,
+ record_only_merge_adds_new_subtree_mergeinfo,
]
if __name__ == '__main__':