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 2010/11/09 21:50:15 UTC
svn commit: r1033215 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/svn/export-cmd.c subversion/tests/cmdline/export_tests.py
subversion/tests/cmdline/merge_tests.py
Author: hwright
Date: Tue Nov 9 20:50:15 2010
New Revision: 1033215
URL: http://svn.apache.org/viewvc?rev=1033215&view=rev
Log:
Reintegrate the 1.6.x-issue3727 branch:
* r1032970
Fix issue #3727, "svn export into the current directory"
Justification:
Regression introduced in 1.6.13, user complained:
http://svn.haxx.se/users/archive-2010-11/0169.shtml
Branch:
^/subversion/branches/1.6.x-issue3727
Votes:
+1: stsp, cmpilato, philip
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/svn/export-cmd.c
subversion/branches/1.6.x/subversion/tests/cmdline/export_tests.py
subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (props changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 20:50:15 2010
@@ -23,6 +23,7 @@
/subversion/branches/1.6.x-issue3654:953882-955338
/subversion/branches/1.6.x-issue3683:965785-988062
/subversion/branches/1.6.x-issue3700:991967-997279
+/subversion/branches/1.6.x-issue3727:1032967-1033213
/subversion/branches/1.6.x-no-svn_uri:876360-876415
/subversion/branches/1.6.x-r1002094:1002741-1002773
/subversion/branches/1.6.x-r36178:877876-877884
@@ -93,4 +94,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,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,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964767,965405,965469,965508,979045,979429,980811,981449,981921,984928,984931,996884,997457,997466,1000038,1000060,1000607,1000612,1001009,1002094,1005446
+/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,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,945350,946767,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964767,965405,965469,965508,979045,979429,980811,981449,981921,984928,984931,996884,997457,997466,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1027957
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 20:50:15 2010
@@ -23,6 +23,7 @@
/subversion/branches/1.6.x-issue3654/CHANGES:953882-955338
/subversion/branches/1.6.x-issue3683/CHANGES:965785-988062
/subversion/branches/1.6.x-issue3700/CHANGES:991967-997279
+/subversion/branches/1.6.x-issue3727/CHANGES:1032967-1033213
/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
/subversion/branches/1.6.x-r1002094/CHANGES:1002741-1002773
/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1033215&r1=1033214&r2=1033215&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Nov 9 20:50:15 2010
@@ -287,16 +287,6 @@ Approved changes:
Votes:
+1: danielsh, cmpilato, stsp
- * r1032970
- Fix issue #3727, "svn export into the current directory"
- Justification:
- Regression introduced in 1.6.13, user complained:
- http://svn.haxx.se/users/archive-2010-11/0169.shtml
- Branch:
- ^/subversion/branches/1.6.x-issue3727
- Votes:
- +1: stsp, cmpilato, philip
-
* r877814
Fix random test failures in merge_tests.py when tests are run in parallel.
Justification:
Modified: subversion/branches/1.6.x/subversion/svn/export-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/svn/export-cmd.c?rev=1033215&r1=1033214&r2=1033215&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/svn/export-cmd.c (original)
+++ subversion/branches/1.6.x/subversion/svn/export-cmd.c Tue Nov 9 20:50:15 2010
@@ -68,16 +68,9 @@ svn_cl__export(apr_getopt_t *os,
if (targets->nelts == 1)
to = svn_path_uri_decode(svn_path_basename(truefrom, pool), pool);
else
- {
- to = APR_ARRAY_IDX(targets, 1, const char *);
+ to = APR_ARRAY_IDX(targets, 1, const char *);
- /* If given the cwd, pretend we weren't given anything. */
- if (strcmp("", to) == 0)
- to = svn_path_uri_decode(svn_path_basename(truefrom, pool), pool);
- else
- /* svn_cl__eat_peg_revisions() but only on one target */
- SVN_ERR(svn_opt__split_arg_at_peg_revision(&to, NULL, to, pool));
- }
+ SVN_ERR(svn_opt__split_arg_at_peg_revision(&to, NULL, to, pool));
if (! opt_state->quiet)
svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE, TRUE,
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/export_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/export_tests.py?rev=1033215&r1=1033214&r2=1033215&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/export_tests.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/export_tests.py Tue Nov 9 20:50:15 2010
@@ -426,6 +426,37 @@ def export_with_url_unsafe_characters(sb
if not os.path.exists(export_target):
raise svntest.Failure("export did not fetch file with URL unsafe path")
+def export_to_current_dir(sbox):
+ "export to current dir"
+ # Issue 3727: Forced export in current dir creates unexpected subdir.
+ sbox.build(create_wc = False, read_only = True)
+
+ svntest.main.safe_rmtree(sbox.wc_dir)
+ os.mkdir(sbox.wc_dir)
+
+ orig_dir = os.getcwd()
+ os.chdir(sbox.wc_dir)
+
+ export_url = sbox.repo_url + '/A/B/E'
+ export_target = '.'
+ expected_output = svntest.wc.State('', {
+ '.' : Item(status='A '),
+ 'alpha' : Item(status='A '),
+ 'beta' : Item(status='A '),
+ })
+ expected_disk = svntest.wc.State('', {
+ 'alpha' : Item("This is the file 'alpha'.\n"),
+ 'beta' : Item("This is the file 'beta'.\n"),
+ })
+ svntest.actions.run_and_verify_export(export_url,
+ export_target,
+ expected_output,
+ expected_disk,
+ None, None, None, None,
+ '--force')
+
+ os.chdir(orig_dir)
+
########################################################################
# Run the tests
@@ -450,6 +481,7 @@ test_list = [ None,
export_creates_intermediate_folders,
export_HEADplus1_fails,
export_with_url_unsafe_characters,
+ export_to_current_dir,
]
if __name__ == '__main__':
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 20:50:15 2010
@@ -23,6 +23,7 @@
/subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py:953882-955338
/subversion/branches/1.6.x-issue3683/subversion/tests/cmdline/merge_tests.py:965785-988062
/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-no-svn_uri/subversion/tests/cmdline/merge_tests.py:876360-876415
/subversion/branches/1.6.x-r1002094/subversion/tests/cmdline/merge_tests.py:1002741-1002773
/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/merge_tests.py:877876-877884