Author: pburba
Date: Fri Jun 25 20:42:08 2010
New Revision: 958108
URL: http://svn.apache.org/viewvc?rev=958108&view=rev
Log:
On the 1.6.x-issue3646 branch: Merge r949307 from trunk.
* src-branch-1.6.x-4
Mergeinfo update.
* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/mergeinfo_tests.py
Clean merge.
* subversion/libsvn_client/merge.c
(populate_remaining_ranges): Account for conflicts due to WCNG work on
trunk.
Modified:
subversion/branches/1.6.x-issue3646/ (props changed)
subversion/branches/1.6.x-issue3646/subversion/libsvn_client/merge.c
subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/merge_tests.py
(contents, props changed)
subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/mergeinfo_tests.py
Propchange: subversion/branches/1.6.x-issue3646/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 25 20:42:08 2010
@@ -81,4 +81,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,87754
4,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-
879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,948512,950931,950933,951753,952992,953317
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,87754
4,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,879403,879631,879635-
879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,948512,949307,950931,950933,951753,952992,953317
Modified: subversion/branches/1.6.x-issue3646/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3646/subversion/libsvn_client/merge.c?rev=958108&r1=958107&r2=958108&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3646/subversion/libsvn_client/merge.c
(original)
+++ subversion/branches/1.6.x-issue3646/subversion/libsvn_client/merge.c Fri
Jun 25 20:42:08 2010
@@ -3734,6 +3734,9 @@ populate_remaining_ranges(apr_array_head
int merge_target_len = strlen(merge_b->target);
int i;
svn_revnum_t gap_start, gap_end;
+ svn_boolean_t child_inherits_implicit;
+ svn_client__merge_path_t *parent;
+ int parent_index;
iterpool = svn_pool_create(pool);
@@ -3756,6 +3759,47 @@ populate_remaining_ranges(apr_array_head
child->remaining_ranges =
apr_array_make(pool, 1, sizeof(svn_merge_range_t *));
APR_ARRAY_PUSH(child->remaining_ranges, svn_merge_range_t *) = range;
+
+ parent = NULL;
+ svn_pool_clear(iterpool);
+
+ /* Issue #3646 'record-only merges create self-referential
+ mergeinfo'. Get the merge target's implicit mergeinfo (natural
+ history). We'll use it later to avoid setting self-referential
+ mergeinfo -- see filter_natural_history_from_mergeinfo(). */
+ if (i == 0) /* First item is always the merge target. */
+ {
+ SVN_ERR(get_full_mergeinfo(NULL, &(child->implicit_mergeinfo),
+ NULL, NULL,
+ svn_mergeinfo_inherited, ra_session,
+ child->path,
+ MAX(revision1, revision2),
+ MIN(revision1, revision2),
+ adm_access, merge_b->ctx, pool));
+ }
+ else
+ {
+ const svn_wc_entry_t *entry;
+
+ /* Issue #3443 - Subtrees of the merge target can inherit
+ their parent's implicit mergeinfo in most cases. */
+ parent_index = find_nearest_ancestor(children_with_mergeinfo,
+ FALSE, child->path);
+ parent = APR_ARRAY_IDX(children_with_mergeinfo, parent_index,
+ svn_client__merge_path_t *);
+ /* If CHILD is a subtree then its parent must be in
+ CHILDREN_WITH_MERGEINFO, see the global comment
+ 'THE CHILDREN_WITH_MERGEINFO ARRAY'. */
+ SVN_ERR_ASSERT(parent);
+
+ child_inherits_implicit = (parent && !child->switched);
+ SVN_ERR(svn_wc_entry(&entry, child->path, adm_access, TRUE,
pool));
+ SVN_ERR(ensure_implicit_mergeinfo(parent, child,
+ child_inherits_implicit,
+ entry, revision1, revision2,
+ ra_session, adm_access,
+ merge_b->ctx, pool, iterpool));
+ }
}
return SVN_NO_ERROR;
}
@@ -3792,8 +3836,8 @@ populate_remaining_ranges(apr_array_head
const char *child_url1, *child_url2;
svn_client__merge_path_t *child =
APR_ARRAY_IDX(children_with_mergeinfo, i, svn_client__merge_path_t *);
- svn_client__merge_path_t *parent = NULL;
- svn_boolean_t child_inherits_implicit;
+
+ parent = NULL;
/* If the path is absent don't do subtree merge either. */
SVN_ERR_ASSERT(child);
@@ -3834,7 +3878,7 @@ populate_remaining_ranges(apr_array_head
/* If CHILD isn't the merge target find its parent. */
if (i > 0)
{
- int parent_index = find_nearest_ancestor(children_with_mergeinfo,
+ parent_index = find_nearest_ancestor(children_with_mergeinfo,
FALSE, child->path);
parent = APR_ARRAY_IDX(children_with_mergeinfo, parent_index,
svn_client__merge_path_t *);
Modified:
subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/merge_tests.py?rev=958108&r1=958107&r2=958108&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/merge_tests.py
(original)
+++ subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/merge_tests.py
Fri Jun 25 20:42:08 2010
@@ -8908,8 +8908,8 @@ def self_reverse_merge(sbox):
# record dummy self mergeinfo to test the fact that self-reversal should work
# irrespective of mergeinfo.
- svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c', '1',
- '--record-only', sbox.repo_url, wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ps', SVN_PROP_MERGEINFO,
+ '/:1', wc_dir)
# Bad svntest.main.greek_state does not have '', so adding it explicitly.
expected_disk.add({'' : Item(props={SVN_PROP_MERGEINFO : '/:1'})})
@@ -16604,8 +16604,8 @@ def added_subtrees_with_mergeinfo_break_
# Test for issue #3646 'cyclic --record-only merges create self-referential
# mergeinfo'
-def cyclic_record_only_merge_creates_self_referential_mergeinfo(sbox):
- "cyclic merge creates self referential mergeinfo"
+def record_only_merge_creates_self_referential_mergeinfo(sbox):
+ "merge creates self referential mergeinfo"
# Given a copy of tr...@m to branch, committed in r(M+1), if we
# --record-only merge the branch back to trunk with no revisions
@@ -16634,20 +16634,7 @@ def cyclic_record_only_merge_creates_sel
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
# Merge A-branch back to A. This should record the mergeinfo '/A-branch:3'
- # on A. Currently however, it records self referential mergeinfo on A of
- # '/A:2'. This test is set as XFail until this issue is fixed.
- #
- # >svn merge ^/A-branch A --record-only
- # --- Recording mergeinfo for merge of r2 into 'A':
- # U A
- # --- Recording mergeinfo for merge of r3 into 'A':
- # G A
- #
- # >svn pg svn:mergeinfo -vR
- # Properties on 'A':
- # svn:mergeinfo
- # /A:2 <-- This is part of A's own history!
- # /A-branch:3
+ # on A.
expected_output = wc.State(A_path, {})
expected_A_status = wc.State(A_path, {
'' : Item(status=' M'),
@@ -16926,7 +16913,7 @@ test_list = [ None,
server_has_mergeinfo),
reintegrate_with_self_referential_mergeinfo,
added_subtrees_with_mergeinfo_break_reintegrate,
-
XFail(cyclic_record_only_merge_creates_self_referential_mergeinfo),
+ record_only_merge_creates_self_referential_mergeinfo,
]
if __name__ == '__main__':
Propchange:
subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 25 20:42:08 2010
@@ -79,4 +79,4 @@
/subversion/branches/tree-conflicts/subversion/tests/cmdline/merge_tests.py:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/merge_tests.py:873926-874008
/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py:953878
-/subversion/trunk/subversion/tests/cmdline/merge_tests.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,
877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,87
9357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,935992,935996,937610,944635,948512,951753,953317
+/subversion/trunk/subversion/tests/cmdline/merge_tests.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,
877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,87
9357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,935992,935996,937610,944635,948512,949307,951753,953317
Modified:
subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/mergeinfo_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/mergeinfo_tests.py?rev=958108&r1=958107&r2=958108&view=diff
==============================================================================
---
subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/mergeinfo_tests.py
(original)
+++
subversion/branches/1.6.x-issue3646/subversion/tests/cmdline/mergeinfo_tests.py
Fri Jun 25 20:42:08 2010
@@ -66,8 +66,8 @@ def mergeinfo(sbox):
wc_dir = sbox.wc_dir
# Dummy up some mergeinfo.
- svntest.actions.run_and_verify_svn(None, None, [], "merge", "-c", "1",
- "--record-only", sbox.repo_url, wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'ps', SVN_PROP_MERGEINFO,
+ '/:1', wc_dir)
svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
[1], sbox.repo_url, wc_dir)
