You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/11/09 19:06:23 UTC
svn commit: r1033128 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: philip
Date: Tue Nov 9 18:06:22 2010
New Revision: 1033128
URL: http://svn.apache.org/viewvc?rev=1033128&view=rev
Log:
Make scan_addition handle elided copyfrom revsions for SVN_WC__OP_DEPTH.
* subversion/libsvn_wc/wc_db.c
(scan_addition): Get copyfrom revision from op root if not set for
local_relpath.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1033128&r1=1033127&r2=1033128&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Nov 9 18:06:22 2010
@@ -6848,6 +6848,7 @@ scan_addition(svn_wc__db_status_t *statu
if (original_repos_relpath
|| original_repos_id
+ || (original_revision && *original_revision == SVN_INVALID_REVNUM)
|| status)
{
if (local_relpath != current_relpath)
@@ -6871,6 +6872,9 @@ scan_addition(svn_wc__db_status_t *statu
current_relpath,
scratch_pool));
}
+
+ if (original_revision && *original_revision == SVN_INVALID_REVNUM)
+ *original_revision = svn_sqlite__column_revnum(stmt, 12);
}
/* current_relpath / current_abspath