You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/06/17 17:02:34 UTC
svn commit: r955624 - in /subversion/branches/1.6.x-issue3242-reintegrate:
./ CHANGES STATUS subversion/libsvn_client/merge.c
subversion/libsvn_wc/copy.c subversion/svn/copy-cmd.c
subversion/tests/cmdline/copy_tests.py
Author: pburba
Date: Thu Jun 17 15:02:33 2010
New Revision: 955624
URL: http://svn.apache.org/viewvc?rev=955624&view=rev
Log:
On the 1.6.x-issue3242-reintegrate branch: Sync up to r955342 from 1.6.x.
Modified:
subversion/branches/1.6.x-issue3242-reintegrate/ (props changed)
subversion/branches/1.6.x-issue3242-reintegrate/CHANGES (props changed)
subversion/branches/1.6.x-issue3242-reintegrate/STATUS
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_wc/copy.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/svn/copy-cmd.c
subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/copy_tests.py
Propchange: subversion/branches/1.6.x-issue3242-reintegrate/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 17 15:02:33 2010
@@ -1,10 +1,12 @@
/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.6.x:954549-955342
/subversion/branches/1.6.x-1.6.8-serfassertion:900822-900868
/subversion/branches/1.6.x-3242-partial-fixes:931279-932637
/subversion/branches/1.6.x-UNC-paths:876471-876545
/subversion/branches/1.6.x-dirent-basename:876130-876262
/subversion/branches/1.6.x-future-proof:880259-884209
/subversion/branches/1.6.x-issue-3242-partial:916088-923778
+/subversion/branches/1.6.x-issue3303:950948-955336
/subversion/branches/1.6.x-issue3390:907042-927863
/subversion/branches/1.6.x-issue3432:878598-924025
/subversion/branches/1.6.x-issue3443:878597-879480
@@ -12,6 +14,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
@@ -40,6 +43,7 @@
/subversion/branches/1.6.x-r923389:927445-929628
/subversion/branches/1.6.x-r926151:927922-929631
/subversion/branches/1.6.x-r933299:933310-934492
+/subversion/branches/1.6.x-r935631:952683-955333
/subversion/branches/1.6.x-r935996:936212-952816
/subversion/branches/1.6.x-wc-ng-check-override:910213-923776
/subversion/branches/1.6.x-wc-ng-error:929379-929636
@@ -73,4 +77,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,945350,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,935631,935992,935996,937610,944635,945350,950931,950933,951753,952992,953317
Propchange: subversion/branches/1.6.x-issue3242-reintegrate/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 17 15:02:33 2010
@@ -1,10 +1,12 @@
/subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.6.x/CHANGES:954549-955342
/subversion/branches/1.6.x-1.6.8-serfassertion/CHANGES:900822-900868
/subversion/branches/1.6.x-3242-partial-fixes/CHANGES:931279-932637
/subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
/subversion/branches/1.6.x-dirent-basename/CHANGES:876130-876262
/subversion/branches/1.6.x-future-proof/CHANGES:880259-884209
/subversion/branches/1.6.x-issue-3242-partial/CHANGES:916088-923778
+/subversion/branches/1.6.x-issue3303/CHANGES:950948-955336
/subversion/branches/1.6.x-issue3390/CHANGES:907042-927863
/subversion/branches/1.6.x-issue3432/CHANGES:878598-924025
/subversion/branches/1.6.x-issue3443/CHANGES:878597-879480
@@ -12,6 +14,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
@@ -40,6 +43,7 @@
/subversion/branches/1.6.x-r923389/CHANGES:927445-929628
/subversion/branches/1.6.x-r926151/CHANGES:927922-929631
/subversion/branches/1.6.x-r933299/CHANGES:933310-934492
+/subversion/branches/1.6.x-r935631/CHANGES:952683-955333
/subversion/branches/1.6.x-r935996/CHANGES:936212-952816
/subversion/branches/1.6.x-wc-ng-check-override/CHANGES:910213-923776
/subversion/branches/1.6.x-wc-ng-error/CHANGES:929379-929636
@@ -72,4 +76,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,945350,951753,953317
+/subversion/trunk/CHANGES:837701-841355,875962-934485,935631,935992,935996,937610,944635,945350,950931,950933,951753,952992,953317
Modified: subversion/branches/1.6.x-issue3242-reintegrate/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/STATUS?rev=955624&r1=955623&r2=955624&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/STATUS (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/STATUS Thu Jun 17 15:02:33 2010
@@ -34,11 +34,13 @@ Candidate changes:
* r879966, r879971
Reduce the lifetime of the rep-sharing database handles in FSFS to avoid
having writers blocking readers, and update that database outside the
- general FSFS write lock. This address issue #3506.
+ general FSFS write lock. This addresses issue #3506.
Justification:
The performance problems and outright failures of the current code
are hurting the ASF repository, and presumably other high-concurrency
repositories, too, when large commits occur.
+ Justification:
+ Pre-requisite for the r934599 group.
Branch:
^/subversion/branches/1.6.x-issue3506
Votes:
@@ -48,7 +50,9 @@ Candidate changes:
Fix a concurrency issue in the FSFS rep-cache code. This indirectly
concerns issue #3506.
Justification:
- Opening the DB twice (and overwriting the handle) is undesired.
+ Thread safety.
+ Thread:
+ http://article.gmane.org/gmane.comp.version-control.subversion.devel/119483
Notes:
r934599 updates the svn_atomic__init_once() interface.
r934603 is the actual fix.
@@ -86,35 +90,46 @@ Candidate changes:
the r878607 log msg.)
* r916286, r917512
- ???
+ Issue description:
+ With the below apache configuration(See the trailing slash at the
+ end of '/svn/').
+
+ <Location /svn/>
+ DAV svn
+ SVNParentPath /repositories
+ #See the trailing slash on the master URI also can cause the confusion.
+ SVNMasterURI http://master/svn/
+ SVNAdvertiseV2Protocol Off
+ </Location>
+
+ Vague and useless error message *without* this fix on client side is
+ snipped below.
+ <snip>
+ svn: Commit failed (details follow):
+ svn: MKACTIVITY of '/svn/demujin/!svn/act/4b6d547c-018d-4e02-9d3f-2b283076cc06': Could not read status line: connection was closed by server (http://localhost)
+ </snip>
+
+
Notes:
This backport depends on the r878590 group only for the conflict free port.
Justification:
- Vague commit error when server has been configured with <Location /svn/>
- and write through proxy.
+ With this fix commit successfully gets proxied and succeeds.
Votes:
+1: kameshj
* r917523
- ???
+ If the configured slave url has the *uri encodable* characters(<space>,
+ '?', '%') *write through* is not happening rather commit happens in
+ slave itself.
Notes:
This backport depends on the r878590 and r916286 groups only for the
conflict free port.
Justification:
- If the configured slave url has the *encodable* characters *write through*
- is not happening rather commit happens in slave itself.
+ With this commit we avoid accidental commit to the slave and hence
+ making it unusable as a proxy anymore.
Votes:
+1: kameshj
- * r935631
- Fix one of the sanity checks in the 'svn merge --reintegrate' logic.
- Justification:
- Sanity checks should themselves be sane.
- Branch:
- ^/subversion/branches/1.6.x-r935631
- Votes:
- +1: cmpilato, pburba
-
* r939375-939376
Fix issue #3623, a bug in foreign repository merges that causes properties
on merge-added files to be dropped from commits of those merges.
@@ -131,57 +146,16 @@ Candidate changes:
* r950445, 950468
Fix for issue #2591 "'svnadmin hotcopy' does not replicate symlinks".
Justification:
- This issue is waiting for resolution for more than 3 years.
+ This fix helps server administrators who has common files symlinked
+ across their repositories and take frequent backups of their repos
+ using svnadmin hotcopy.
Notes:
r950445 fixes the issue and r950468 is a test for this issue.
Votes:
- +1: stylesen
-
- * r950931, 950933
- Fix for issue #3303 "cannot copy broken symlink".
- Justification:
- This issue was reported in 1.5.x hence it is nice to have in 1.6.x.
- Notes:
- r950933 fixes the issue and r950931 is a test for this issue.
- Branch:
- ^/subversion/branches/1.6.x-issue3303
- Votes:
- +1: stylesen
-
- * 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
-
- * r953878, r876855
- Fix issue #3654 'Added subtrees with mergeinfo break reintegrate'
- Justification:
- In certain use cases, this bug breaks reintegrate merges. Love or
- hate reintegrate, many users like it and rely on it heavily. See
- http://subversion.tigris.org/issues/show_bug.cgi?id=3654 for more.
- Notes:
- r953878 is a new test for this issue.
- r876855 is from ^/subversion/branches/subtree-mergeinfo@876855 and is
- actual fix for this issue on 1.6.x. The subtree-mergeinfo branch is
- already on trunk in it's entirety, but we want only this small portion
- on 1.6.x.
- Branch:
- ^/subversion/branches/1.6.x-issue3654
- When reintegrating the branch use the '-x --ignore-eol-style' option or
- the entire merge_tests.py file conflicts. No idea why this is, the file
- has svn:eolstyle native on both 1.6.x and the branch.
- Votes:
- +1: pburba
+ +1: stylesen, cmpilato
+ -0: julianfoad (Tested and works fine, but changes semantics of
+ svn_io_dir_walk() which we should not do in a back-port.
+ Discussing on list.)
Veto-blocked changes:
=====================
@@ -242,7 +216,7 @@ Veto-blocked changes:
Branch:
^/subversion/branches/1.6.x-issue3020
Votes:
- +1: rhuijben, kameshj
+ +1: kameshj
-1: pburba (There is a regression with this fix, see
http://svn.haxx.se/dev/archive-2010-03/0716.shtml)
@@ -258,3 +232,23 @@ Veto-blocked changes:
Approved changes:
=================
+
+ * r953878, r876855
+ Fix issue #3654 'Added subtrees with mergeinfo break reintegrate'
+ Justification:
+ In certain use cases, this bug breaks reintegrate merges. Love or
+ hate reintegrate, many users like it and rely on it heavily. See
+ http://subversion.tigris.org/issues/show_bug.cgi?id=3654 for more.
+ Notes:
+ r953878 is a new test for this issue.
+ r876855 is from ^/subversion/branches/subtree-mergeinfo@876855 and is
+ actual fix for this issue on 1.6.x. The subtree-mergeinfo branch is
+ already on trunk in it's entirety, but we want only this small portion
+ on 1.6.x.
+ Branch:
+ ^/subversion/branches/1.6.x-issue3654
+ When reintegrating the branch use the '-x --ignore-eol-style' option or
+ the entire merge_tests.py file conflicts. No idea why this is, the file
+ has svn:eol-style native on both 1.6.x and the branch.
+ Votes:
+ +1: pburba, cmpilato, rhuijben
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c?rev=955624&r1=955623&r2=955624&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_client/merge.c Thu Jun 17 15:02:33 2010
@@ -8617,11 +8617,9 @@ svn_client_merge_reintegrate(const char
SVN_ERR(svn_client__get_repos_root(&wc_repos_root, target_wcpath,
&working_revision, adm_access, ctx, pool));
- /* Open an RA session to our source URL, and determine its root URL. */
- SVN_ERR(svn_client__open_ra_session_internal(&ra_session, wc_repos_root,
- NULL, NULL, NULL,
- FALSE, FALSE, ctx, pool));
- SVN_ERR(svn_ra_get_repos_root2(ra_session, &source_repos_root, pool));
+ /* Determine the source's repository root URL. */
+ SVN_ERR(svn_client__get_repos_root(&source_repos_root, url2,
+ peg_revision, adm_access, ctx, pool));
/* source_repos_root and wc_repos_root are required to be the same,
as mergeinfo doesn't come into play for cross-repository merging. */
@@ -8631,6 +8629,16 @@ svn_client_merge_reintegrate(const char
"'%s'"), svn_path_local_style(source, pool),
svn_path_local_style(target_wcpath, pool));
+ /* Open an RA session to our (common) repository root URL */
+
+ /* ### FIXME: Oops! Can we open this session to a more conservative
+ ### location, in case the user lacks read access at the
+ ### repository root? */
+ SVN_ERR(svn_client__open_ra_session_internal(&ra_session, wc_repos_root,
+ NULL, NULL, NULL,
+ FALSE, FALSE, ctx,
+ pool));
+
SVN_ERR(ensure_wc_reflects_repository_subtree(target_wcpath, ctx, pool));
/* As the WC tree is "pure", use its last-updated-to revision as
Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_wc/copy.c?rev=955624&r1=955623&r2=955624&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_wc/copy.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/libsvn_wc/copy.c Thu Jun 17 15:02: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-issue3242-reintegrate/subversion/svn/copy-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/svn/copy-cmd.c?rev=955624&r1=955623&r2=955624&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/svn/copy-cmd.c (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/svn/copy-cmd.c Thu Jun 17 15:02:33 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-issue3242-reintegrate/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/copy_tests.py?rev=955624&r1=955623&r2=955624&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/copy_tests.py Thu Jun 17 15:02:33 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, [], [],
@@ -4092,6 +4093,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 +4206,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__':