Author: hwright
Date: Tue May 17 10:23:06 2011
New Revision: 1104109
URL: http://svn.apache.org/viewvc?rev=1104109&view=rev
Log:
Reintegrate the 1.6.x-issue3816 branch:
* r1083883, r1076826
Fix issue #3816, "file external can cause mixed-revision working
copy after checkout"
Justification:
Without this fix, file externals pinned to a revision can prevent
reintegrate merges.
Notes:
r1083883 is the actual fix and has no corresponding trunk revision.
r1076826 added a test case on trunk (merged to the branch in r1083892).
Branch:
^/subversion/branches/1.6.x-issue3816
Votes:
+1: stsp, pburba, cmpilato
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_wc/revision_status.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)
subversion/branches/1.6.x/subversion/tests/cmdline/svnversion_tests.py
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 10:23:06 2011
@@ -27,6 +27,7 @@
/subversion/branches/1.6.x-issue3719:1075930-1096984
/subversion/branches/1.6.x-issue3727:1032967-1033213
/subversion/branches/1.6.x-issue3745:1032257-1033223
+/subversion/branches/1.6.x-issue3816:1083880-1104106
/subversion/branches/1.6.x-issue3843:1084999-1104104
/subversion/branches/1.6.x-issue3845:1086922-1104099
/subversion/branches/1.6.x-issue3853:1091877-1103782
@@ -111,4 +112,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,880146,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,902467,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,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957
,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1084575,1084581,1084962,1084978,1086222,1094692,1095654,1103665
+/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,880146,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,902467,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,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957
,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1076826,1084575,1084581,1084962,1084978,1086222,1094692,1095654,1103665
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 10:23:06 2011
@@ -26,6 +26,7 @@
/subversion/branches/1.6.x-issue3700/CHANGES:991967-997279
/subversion/branches/1.6.x-issue3727/CHANGES:1032967-1033213
/subversion/branches/1.6.x-issue3745/CHANGES:1032257-1033223
+/subversion/branches/1.6.x-issue3816/CHANGES:1083880-1104106
/subversion/branches/1.6.x-issue3845/CHANGES:1086922-1104099
/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
/subversion/branches/1.6.x-no-wcng-check/CHANGES:1022248-1035322
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1104109&r1=1104108&r2=1104109&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 10:23:06 2011
@@ -337,17 +337,3 @@ Approved changes:
that are currently nominated...so my +1 is conditional on
that fix being applied first.)
+1: danielsh (pburba: a fix to #3641 was committed to trunk)
-
- * r1083883, r1076826
- Fix issue #3816, "file external can cause mixed-revision working
- copy after checkout"
- Justification:
- Without this fix, file externals pinned to a revision can prevent
- reintegrate merges.
- Notes:
- r1083883 is the actual fix and has no corresponding trunk revision.
- r1076826 added a test case on trunk (merged to the branch in r1083892).
- Branch:
- ^/subversion/branches/1.6.x-issue3816
- Votes:
- +1: stsp, pburba, cmpilato
Modified: subversion/branches/1.6.x/subversion/libsvn_wc/revision_status.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_wc/revision_status.c?rev=1104109&r1=1104108&r2=1104109&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_wc/revision_status.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_wc/revision_status.c Tue May 17
10:23:06 2011
@@ -44,8 +44,8 @@ analyze_status(void *baton,
if (! status->entry)
return SVN_NO_ERROR;
- /* Added files have a revision of no interest */
- if (status->text_status != svn_wc_status_added)
+ /* Added files and file externals have a revision of no interest */
+ if (status->text_status != svn_wc_status_added && !status->file_external)
{
svn_revnum_t item_rev = (sb->committed
? status->entry->cmt_rev
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 10:23:06 2011
@@ -26,6 +26,7 @@
/subversion/branches/1.6.x-issue3700/subversion/tests/cmdline/merge_tests.py:991967-997279
/subversion/branches/1.6.x-issue3727/subversion/tests/cmdline/merge_tests.py:1032967-1033213
/subversion/branches/1.6.x-issue3745/subversion/tests/cmdline/merge_tests.py:1032257-1033223
+/subversion/branches/1.6.x-issue3816/subversion/tests/cmdline/merge_tests.py:1083880-1104106
/subversion/branches/1.6.x-issue3845/subversion/tests/cmdline/merge_tests.py:1086922-1104099
/subversion/branches/1.6.x-no-svn_uri/subversion/tests/cmdline/merge_tests.py:876360-876415
/subversion/branches/1.6.x-no-wcng-check/subversion/tests/cmdline/merge_tests.py:1022248-1035322
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 10:23:06 2011
@@ -26,6 +26,7 @@
/subversion/branches/1.6.x-issue3700/subversion/tests/cmdline/svntest/main.py:991967-997279
/subversion/branches/1.6.x-issue3727/subversion/tests/cmdline/svntest/main.py:1032967-1033213
/subversion/branches/1.6.x-issue3745/subversion/tests/cmdline/svntest/main.py:1032257-1033223
+/subversion/branches/1.6.x-issue3816/subversion/tests/cmdline/svntest/main.py:1083880-1104106
/subversion/branches/1.6.x-issue3845/subversion/tests/cmdline/svntest/main.py:1086922-1104099
/subversion/branches/1.6.x-no-svn_uri/subversion/tests/cmdline/svntest/main.py:876360-876415
/subversion/branches/1.6.x-no-wcng-check/subversion/tests/cmdline/svntest/main.py:1022248-1035322
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/svnversion_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/svnversion_tests.py?rev=1104109&r1=1104108&r2=1104109&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/svnversion_tests.py
(original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/svnversion_tests.py Tue
May 17 10:23:06 2011
@@ -141,6 +141,7 @@ def svnversion_test(sbox):
#----------------------------------------------------------------------
+# issue 3816
def ignore_externals(sbox):
"test 'svnversion' with svn:externals"
sbox.build()
@@ -149,7 +150,10 @@ def ignore_externals(sbox):
# Set up an external item
C_path = os.path.join(wc_dir, "A", "C")
- externals_desc = "ext -r 1 " + repo_url + "/A/D/G" + "\n"
+ externals_desc = """\
+ext-dir -r 1 %s/A/D/G
+ext-file -r 1 %s/A/D/H/omega
+""" % (repo_url, repo_url)
tmp_f = os.tempnam(wc_dir, 'tmp')
svntest.main.file_append(tmp_f, externals_desc)
svntest.actions.run_and_verify_svn(None, None, [],
@@ -168,10 +172,18 @@ def ignore_externals(sbox):
# Update to get it on disk
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
- ext_path = os.path.join(C_path, 'ext')
+ ext_dir_path = os.path.join(C_path, 'ext-dir')
+ ext_file_path = os.path.join(C_path, 'ext-file')
exit_code, out, err = svntest.actions.run_and_verify_svn(
- None, svntest.verify.AnyOutput, [], 'info', ext_path)
+ None, svntest.verify.AnyOutput, [], 'info', ext_dir_path)
+ for line in out:
+ if line.find('Revision: 1') != -1:
+ break
+ else:
+ raise svntest.Failure
+ exit_code, out, err = svntest.actions.run_and_verify_svn(
+ None, svntest.verify.AnyOutput, [], 'info', ext_file_path)
for line in out:
if line.find('Revision: 1') != -1:
break
