You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ben Reser <be...@reser.org> on 2012/10/14 04:37:15 UTC
Re: svn commit: r1397145 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/commit_util.c
libsvn_client/copy.c libsvn_wc/node.c tests/cmdline/copy_tests.py
This commit is clearly wrong... But it also may be demonstrating a
failure in our test suite.
Creating an un-versioned file and then moving a versioned file over it
does not fail.
In the past we'd fail like this:
[[[
$ svn co file:///Users/breser/foo2 foo2-wc
A foo2-wc/x
Checked out revision 1.
$ cd foo2-wc/
$ echo 'bdlkjdfljd' > y
$ svn mv x y
svn: Path 'y' is not a directory
]]]
Now it succeeds.
On Thu, Oct 11, 2012 at 12:21 PM, <rh...@apache.org> wrote:
> Modified: subversion/trunk/subversion/libsvn_client/copy.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1397145&r1=1397144&r2=1397145&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/copy.c (original)
> +++ subversion/trunk/subversion/libsvn_client/copy.c Thu Oct 11 16:21:42 2012
> @@ -397,11 +397,30 @@ verify_wc_srcs_and_dsts(const apr_array_
> /* If DST_PATH does not exist, then its basename will become a new
> file or dir added to its parent (possibly an implicit '.').
> Else, just error out. */
> - SVN_ERR(svn_io_check_path(pair->dst_abspath_or_url, &dst_kind,
> - iterpool));
> + SVN_ERR(svn_wc_read_kind(&dst_kind, ctx->wc_ctx,
> + pair->dst_abspath_or_url, TRUE /* show_hidden */,
> + iterpool));
The above code instead of checking the disk is now checking only the
DB. So it does not look at un-versioned files/directories etc...