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/02/19 15:37:38 UTC
svn commit: r1072347 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_client/merge.c subversion/tests/cmdline/merge_tests.py
subversion/tests/cmdline/svntest/main.py
Author: hwright
Date: Sat Feb 19 14:37:37 2011
New Revision: 1072347
URL: http://svn.apache.org/viewvc?rev=1072347&view=rev
Log:
Reintegrate the 1.6.x-r1058269 branch:
* r1058269
Fix issue #3486, "attempt to add tree conflict that already exists" again.
Justification:
Users should not be able to run into this situation.
Branch:
^/subversion/branches/1.6.x-r1058269
Votes:
+1: stsp, philip, rhuijben
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/libsvn_client/merge.c
subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (props changed)
subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py (props changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 14:37:37 2011
@@ -30,6 +30,7 @@
/subversion/branches/1.6.x-r1002094:1002741-1002773
/subversion/branches/1.6.x-r1024269:1024274-1035798
/subversion/branches/1.6.x-r1051744:1052424-1071327
+/subversion/branches/1.6.x-r1058269:1058271-1072344
/subversion/branches/1.6.x-r1068988:1070588-1072337
/subversion/branches/1.6.x-r36178:877876-877884
/subversion/branches/1.6.x-r36252:876328-876788
@@ -102,4 +103,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-876615,876628,876633,876641,876645,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,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-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,907644,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,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028108,1031165,1031
186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058722,1064839,1068988,1071239,1071307
+/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-876615,876628,876633,876641,876645,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,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-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,907644,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,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028108,1031165,1031
186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058269,1058722,1064839,1068988,1071239,1071307
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 14:37:37 2011
@@ -30,6 +30,7 @@
/subversion/branches/1.6.x-r1002094/CHANGES:1002741-1002773
/subversion/branches/1.6.x-r1024269/CHANGES:1024274-1035798
/subversion/branches/1.6.x-r1051744/CHANGES:1052424-1071327
+/subversion/branches/1.6.x-r1058269/CHANGES:1058271-1072344
/subversion/branches/1.6.x-r1068988/CHANGES:1070588-1072337
/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
/subversion/branches/1.6.x-r36252/CHANGES:876328-876788
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1072347&r1=1072346&r2=1072347&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Sat Feb 19 14:37:37 2011
@@ -335,12 +335,3 @@ Approved changes:
Fixes an uninitialized variable that can result in a segfault.
Votes:
+1: pburba, stsp, rhuijben
-
- * r1058269
- Fix issue #3486, "attempt to add tree conflict that already exists" again.
- Justification:
- Users should not be able to run into this situation.
- Branch:
- ^/subversion/branches/1.6.x-r1058269
- Votes:
- +1: stsp, philip, rhuijben
Modified: subversion/branches/1.6.x/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_client/merge.c?rev=1072347&r1=1072346&r2=1072347&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_client/merge.c Sat Feb 19 14:37:37 2011
@@ -502,7 +502,9 @@ make_tree_conflict(svn_wc_conflict_descr
}
/* Record a tree conflict in the WC, unless this is a dry run or a record-
- * only merge.
+ * only merge, or if a tree conflict is already flagged for the VICTIM_PATH.
+ * (The latter can happen if a merge-tracking-aware merge is doing multiple
+ * editor drives because of a gap in the range of eligible revisions.)
*
* The tree conflict, with its victim specified by VICTIM_PATH, is
* assumed to have happened during a merge using merge baton MERGE_B.
@@ -523,16 +525,22 @@ tree_conflict(merge_cmd_baton_t *merge_b
svn_wc_conflict_action_t action,
svn_wc_conflict_reason_t reason)
{
+ svn_wc_conflict_description_t *existing_conflict;
svn_wc_conflict_description_t *conflict;
if (merge_b->record_only || merge_b->dry_run)
return SVN_NO_ERROR;
- /* Construct the new conflict first to get the proper conflict->path */
- SVN_ERR(make_tree_conflict(&conflict, merge_b, adm_access, victim_path,
- node_kind, action, reason));
+ SVN_ERR(svn_wc__get_tree_conflict(&existing_conflict, victim_path,
+ adm_access, merge_b->pool));
+ if (existing_conflict == NULL)
+ {
+ /* There is no existing tree conflict so it is safe to add one. */
+ SVN_ERR(make_tree_conflict(&conflict, merge_b, adm_access, victim_path,
+ node_kind, action, reason));
+ SVN_ERR(svn_wc__add_tree_conflict(conflict, adm_access, merge_b->pool));
+ }
- SVN_ERR(svn_wc__add_tree_conflict(conflict, adm_access, merge_b->pool));
return SVN_NO_ERROR;
}
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 14:37:37 2011
@@ -30,6 +30,7 @@
/subversion/branches/1.6.x-r1002094/subversion/tests/cmdline/merge_tests.py:1002741-1002773
/subversion/branches/1.6.x-r1024269/subversion/tests/cmdline/merge_tests.py:1024274-1035798
/subversion/branches/1.6.x-r1051744/subversion/tests/cmdline/merge_tests.py:1052424-1071327
+/subversion/branches/1.6.x-r1058269/subversion/tests/cmdline/merge_tests.py:1058271-1072344
/subversion/branches/1.6.x-r1068988/subversion/tests/cmdline/merge_tests.py:1070588-1072337
/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/merge_tests.py:877876-877884
/subversion/branches/1.6.x-r36252/subversion/tests/cmdline/merge_tests.py:876328-876788
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 19 14:37:37 2011
@@ -30,6 +30,7 @@
/subversion/branches/1.6.x-r1002094/subversion/tests/cmdline/svntest/main.py:1002741-1002773
/subversion/branches/1.6.x-r1024269/subversion/tests/cmdline/svntest/main.py:1024274-1035798
/subversion/branches/1.6.x-r1051744/subversion/tests/cmdline/svntest/main.py:1052424-1071327
+/subversion/branches/1.6.x-r1058269/subversion/tests/cmdline/svntest/main.py:1058271-1072344
/subversion/branches/1.6.x-r1068988/subversion/tests/cmdline/svntest/main.py:1070588-1072337
/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/svntest/main.py:877876-877884
/subversion/branches/1.6.x-r36252/subversion/tests/cmdline/svntest/main.py:876328-876788