You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/06/03 13:03:33 UTC
svn commit: r950952 - in /subversion/branches/1.6.x-issue3303: ./ CHANGES
subversion/libsvn_wc/copy.c subversion/tests/cmdline/copy_tests.py
Author: stylesen
Date: Thu Jun 3 11:03:33 2010
New Revision: 950952
URL: http://svn.apache.org/viewvc?rev=950952&view=rev
Log:
On the '1.6.x-issue3303' branch:
Merge from trunk (with conflict resolution and changes due to latest
development in trunk) r950931, 950933.
Modified:
subversion/branches/1.6.x-issue3303/ (props changed)
subversion/branches/1.6.x-issue3303/CHANGES (props changed)
subversion/branches/1.6.x-issue3303/subversion/libsvn_wc/copy.c
subversion/branches/1.6.x-issue3303/subversion/tests/cmdline/copy_tests.py
Propchange: subversion/branches/1.6.x-issue3303/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 3 11:03:33 2010
@@ -70,4 +70,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,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,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,87756
5,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,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,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,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,898963,899826,899828,900797,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
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,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,87756
5,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,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878915,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,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,898963,899826,899828,900797,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,950931,950933
Propchange: subversion/branches/1.6.x-issue3303/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 3 11:03:33 2010
@@ -69,4 +69,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
+/subversion/trunk/CHANGES:837701-841355,875962-934485,950931,950933
Modified: subversion/branches/1.6.x-issue3303/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3303/subversion/libsvn_wc/copy.c?rev=950952&r1=950951&r2=950952&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3303/subversion/libsvn_wc/copy.c (original)
+++ subversion/branches/1.6.x-issue3303/subversion/libsvn_wc/copy.c Thu Jun 3 11:03:33 2010
@@ -101,12 +101,20 @@ copy_added_file_administratively(const c
void *notify_baton,
apr_pool_t *pool)
{
+ svn_node_kind_t kind;
+ svn_boolean_t is_special;
const char *dst_path
= svn_path_join(svn_wc_adm_access_path(dst_parent_access),
dst_basename, pool);
- /* Copy this file and possibly put it under version control. */
- SVN_ERR(svn_io_copy_file(src_path, dst_path, TRUE, pool));
+ /* Check to see if this is a special file. */
+ SVN_ERR(svn_io_check_special_path(src_path, &kind, &is_special,
+ pool));
+
+ if (is_special)
+ SVN_ERR(svn_io_copy_link(src_path, dst_path, pool));
+ else
+ SVN_ERR(svn_io_copy_file(src_path, dst_path, TRUE, pool));
if (src_is_added)
{
Modified: subversion/branches/1.6.x-issue3303/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3303/subversion/tests/cmdline/copy_tests.py?rev=950952&r1=950951&r2=950952&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3303/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/1.6.x-issue3303/subversion/tests/cmdline/copy_tests.py Thu Jun 3 11:03:33 2010
@@ -4092,6 +4092,37 @@ def path_copy_in_repo_2475(sbox):
expected_status)
+def copy_broken_symlink(sbox):
+ """copy broken symlink"""
+
+ ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3303. ##
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ new_symlink = os.path.join(wc_dir, 'new_symlink');
+ copied_symlink = os.path.join(wc_dir, 'copied_symlink');
+ os.symlink('linktarget', new_symlink)
+
+ # Alias for svntest.actions.run_and_verify_svn
+ rav_svn = svntest.actions.run_and_verify_svn
+
+ rav_svn(None, None, [], 'add', new_symlink)
+ rav_svn(None, None, [], 'cp', new_symlink, copied_symlink)
+
+ # Check whether both new_symlink and copied_symlink are added to the
+ # working copy
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+
+ expected_status.add(
+ {
+ 'new_symlink' : Item(status='A ', wc_rev='0'),
+ 'copied_symlink' : Item(status='A ', wc_rev='0'),
+ })
+
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+
########################################################################
# Run the tests
@@ -4174,6 +4205,7 @@ test_list = [ None,
find_copyfrom_information_upstairs,
path_move_and_copy_between_wcs_2475,
path_copy_in_repo_2475,
+ SkipUnless(copy_broken_symlink, svntest.main.is_posix_os),
]
if __name__ == '__main__':