subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1228370 - in /subversion/trunk/subversion/libsvn_wc: status.c update_editor.c
Date Fri, 06 Jan 2012 19:49:46 GMT
Author: hwright
Date: Fri Jan  6 19:49:46 2012
New Revision: 1228370

URL: http://svn.apache.org/viewvc?rev=1228370&view=rev
Log:
Ev2 shims: when fetching background information in the WC, make sure we use
the correct base path to construct the full abspath.

Current number of Ev2 test failures: 385

* subversion/libsvn_wc/update_editor.c
  (make_editor),
* subversion/libsvn_wc/status.c
  (svn_wc_get_status_editor5):
    Use the anchor abspath, rather than the target abspath for our edit
    base path.

Modified:
    subversion/trunk/subversion/libsvn_wc/status.c
    subversion/trunk/subversion/libsvn_wc/update_editor.c

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1228370&r1=1228369&r2=1228370&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri Jan  6 19:49:46 2012
@@ -2548,7 +2548,7 @@ svn_wc_get_status_editor5(const svn_delt
 
   sfb = apr_palloc(result_pool, sizeof(*sfb));
   sfb->db = wc_ctx->db;
-  sfb->base_abspath = eb->target_abspath;
+  sfb->base_abspath = eb->anchor_abspath;
   sfb->fetch_base = FALSE;
 
   shim_callbacks->fetch_kind_func = svn_wc__fetch_kind_func;

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1228370&r1=1228369&r2=1228370&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Jan  6 19:49:46 2012
@@ -4988,7 +4988,7 @@ make_editor(svn_revnum_t *target_revisio
 
   sfb = apr_palloc(result_pool, sizeof(*sfb));
   sfb->db = db;
-  sfb->base_abspath = eb->target_abspath;
+  sfb->base_abspath = eb->anchor_abspath;
   sfb->fetch_base = TRUE;
 
   shim_callbacks->fetch_kind_func = svn_wc__fetch_kind_func;



Mime
View raw message