subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r954995 - in /subversion/branches/1.6.x: ./ CHANGES STATUS subversion/svn/copy-cmd.c subversion/tests/cmdline/copy_tests.py
Date Tue, 15 Jun 2010 18:18:18 GMT
Author: hwright
Date: Tue Jun 15 18:18:18 2010
New Revision: 954995

URL: http://svn.apache.org/viewvc?rev=954995&view=rev
Log:
Reintegrate the 1.6.x-issue3651 branch:

 * r952973, r952992
   Fix for issue #3651 "svn copy does not eat peg revision within copy target
   path"
   Justification:
     This issue exists in 1.6.x.
   Notes:
     r952973 fixes the issue and r952992 is a test for this issue. Both r952973
     and r952992 are merged into the backport branch 1.6.x-issue3651.
     Use the private API in the 1.6.x branch since the API was made public in
     1.7. The backport branch exists in order to resolve this.
   Branch:
     ^/subversion/branches/1.6.x-issue3651
   Votes:
     +1: stylesen, 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/svn/copy-cmd.c
    subversion/branches/1.6.x/subversion/tests/cmdline/copy_tests.py

Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 15 18:18:18 2010
@@ -12,6 +12,7 @@
 /subversion/branches/1.6.x-issue3519:880376-889934
 /subversion/branches/1.6.x-issue3573:906488-923765
 /subversion/branches/1.6.x-issue3605:923668-923887
+/subversion/branches/1.6.x-issue3651:952977-954985
 /subversion/branches/1.6.x-no-svn_uri:876360-876415
 /subversion/branches/1.6.x-r36178:877876-877884
 /subversion/branches/1.6.x-r36252:876328-876788
@@ -73,4 +74,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,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,951753,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,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,951753,952992,953317

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 15 18:18:18 2010
@@ -12,6 +12,7 @@
 /subversion/branches/1.6.x-issue3519/CHANGES:880376-889934
 /subversion/branches/1.6.x-issue3573/CHANGES:906488-923765
 /subversion/branches/1.6.x-issue3605/CHANGES:923668-923887
+/subversion/branches/1.6.x-issue3651/CHANGES:952977-954985
 /subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
 /subversion/branches/1.6.x-r36178/CHANGES:877876-877884
 /subversion/branches/1.6.x-r36252/CHANGES:876328-876788
@@ -72,4 +73,4 @@
 /subversion/branches/tc_url_rev/CHANGES:874351-874483
 /subversion/branches/tree-conflicts/CHANGES:868291-873154
 /subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-/subversion/trunk/CHANGES:837701-841355,875962-934485,935992,935996,937610,944635,951753,953317
+/subversion/trunk/CHANGES:837701-841355,875962-934485,935992,935996,937610,944635,951753,952992,953317

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=954995&r1=954994&r2=954995&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Jun 15 18:18:18 2010
@@ -251,18 +251,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r952973, r952992
-   Fix for issue #3651 "svn copy does not eat peg revision within copy target
-   path"
-   Justification:
-     This issue exists in 1.6.x.
-   Notes:
-     r952973 fixes the issue and r952992 is a test for this issue. Both r952973
-     and r952992 are merged into the backport branch 1.6.x-issue3651.
-     Use the private API in the 1.6.x branch since the API was made public in
-     1.7. The backport branch exists in order to resolve this.
-   Branch:
-     ^/subversion/branches/1.6.x-issue3651
-   Votes:
-     +1: stylesen, pburba, cmpilato

Modified: subversion/branches/1.6.x/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/svn/copy-cmd.c?rev=954995&r1=954994&r2=954995&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/svn/copy-cmd.c (original)
+++ subversion/branches/1.6.x/subversion/svn/copy-cmd.c Tue Jun 15 18:18:18 2010
@@ -28,6 +28,7 @@
 #include "cl.h"
 
 #include "svn_private_config.h"
+#include "private/svn_opt_private.h"
 
 
 /*** Code. ***/
@@ -72,6 +73,8 @@ svn_cl__copy(apr_getopt_t *os,
       APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = source;
     }
 
+  SVN_ERR(svn_opt__eat_peg_revisions(&targets, targets, pool));
+
   /* Figure out which type of trace editor to use.
      If the src_paths are not homogeneous, setup_copy will return an error. */
   src_path = APR_ARRAY_IDX(targets, 0, const char *);

Modified: subversion/branches/1.6.x/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/copy_tests.py?rev=954995&r1=954994&r2=954995&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/copy_tests.py Tue Jun 15 18:18:18 2010
@@ -3352,10 +3352,11 @@ def copy_peg_rev_url(sbox):
                                      wc_dir)
 
   # Copy using a peg rev
+  # Add peg rev '@HEAD' to sigma_url when copying which tests for issue #3651.
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'cp',
                                      iota_url + '@HEAD', '-r', '1',
-                                     sigma_url, '-m', 'rev 3')
+                                     sigma_url + '@HEAD', '-m', 'rev 3')
 
   # Validate the copy destination's mergeinfo (we expect none).
   svntest.actions.run_and_verify_svn(None, [], [],



Mime
View raw message