Author: julianfoad
Date: Thu Apr 12 16:09:10 2012
New Revision: 1325341
URL: http://svn.apache.org/viewvc?rev=1325341&view=rev
Log:
Fix svn_wc__node_get_base_rev() -- don't report the working revision.
A follow-up to r1088832.
* subversion/libsvn_wc/node.c
(get_base_rev): If there is no base version, don't report the working
revision instead, just report SVN_INVALID_REVNUM.
* subversion/libsvn_client/copy.c
(wc_to_repos_copy): Add a comment about how we should perhaps not be using
svn_wc__node_get_base_rev() at all here.
Modified:
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1325341&r1=1325340&r2=1325341&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Thu Apr 12 16:09:10 2012
@@ -1206,7 +1206,9 @@ wc_to_repos_copy(const apr_array_header_
/* Verify that all the source paths exist, are versioned, etc.
We'll do so by querying the base revisions of those things (which
- we'll need to know later anyway). */
+ we'll need to know later anyway).
+ ### Should we use the 'origin' revision instead of 'base'?
+ */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1325341&r1=1325340&r2=1325341&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Apr 12 16:09:10 2012
@@ -882,7 +882,6 @@ get_base_rev(svn_revnum_t *base_revision
const char *local_abspath,
apr_pool_t *scratch_pool)
{
- svn_boolean_t have_base;
svn_error_t *err;
err = svn_wc__db_base_get_info(NULL, NULL, base_revision, NULL,
@@ -896,13 +895,7 @@ get_base_rev(svn_revnum_t *base_revision
svn_error_clear(err);
- SVN_ERR(svn_wc__db_read_info(NULL, NULL, base_revision,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, &have_base, NULL,
- NULL, NULL, NULL, NULL, NULL,
- db, local_abspath,
- scratch_pool, scratch_pool));
+ *base_revision = SVN_INVALID_REVNUM;
return SVN_NO_ERROR;
}
