Author: pburba Date: Thu Aug 25 20:35:26 2011 New Revision: 1161738 URL: http://svn.apache.org/viewvc?rev=1161738&view=rev Log: On the 1.7.x-issue-3976 branch: Merge r1161721 from ^/subversion/trunk.
Modified: subversion/branches/1.7.x-issue3976/ (props changed) subversion/branches/1.7.x-issue3976/subversion/libsvn_client/merge.c 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:35:26 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,1161683 +/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,1161721 Modified: subversion/branches/1.7.x-issue3976/subversion/libsvn_client/merge.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue3976/subversion/libsvn_client/merge.c?rev=1161738&r1=1161737&r2=1161738&view=diff ============================================================================== --- subversion/branches/1.7.x-issue3976/subversion/libsvn_client/merge.c (original) +++ subversion/branches/1.7.x-issue3976/subversion/libsvn_client/merge.c Thu Aug 25 20:35:26 2011 @@ -1179,13 +1179,21 @@ merge_props_changed(svn_wc_notify_state_ if (strcmp(prop->name, SVN_PROP_MERGEINFO) == 0) { - /* Does PATH have any working mergeinfo? */ - svn_string_t *mergeinfo_prop = - apr_hash_get(original_props, - SVN_PROP_MERGEINFO, - APR_HASH_KEY_STRING); + /* Does LOCAL_ABSPATH have any pristine mergeinfo? */ + svn_boolean_t has_pristine_mergeinfo = FALSE; + apr_hash_t *pristine_props; + + SVN_ERR(svn_wc_get_pristine_props(&pristine_props, + ctx->wc_ctx, + local_abspath, + scratch_pool, + scratch_pool)); + + if (apr_hash_get(pristine_props, SVN_PROP_MERGEINFO, + APR_HASH_KEY_STRING)) + has_pristine_mergeinfo = TRUE; - if (!mergeinfo_prop && prop->value) + if (!has_pristine_mergeinfo && prop->value) { /* If BATON->PATHS_WITH_NEW_MERGEINFO needs to be allocated do so in BATON->POOL so it has a @@ -1198,7 +1206,7 @@ merge_props_changed(svn_wc_notify_state_ apr_pstrdup(merge_b->pool, local_abspath), APR_HASH_KEY_STRING, local_abspath); } - else if (mergeinfo_prop && !prop->value) + else if (has_pristine_mergeinfo && !prop->value) { /* If BATON->PATHS_WITH_DELETED_MERGEINFO needs to be allocated do so in BATON->POOL so it has a 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=1161738&r1=1161737&r2=1161738&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:35:26 2011 @@ -17044,7 +17044,6 @@ def merge_adds_subtree_with_mergeinfo(sb # 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" @@ -17082,15 +17081,13 @@ def record_only_merge_adds_new_subtree_m 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: + # A_COPY_2/D/H/psi with three new property additions: # # 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'),