subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1329234 - in /subversion/trunk: ./ subversion/libsvn_delta/compat.c
Date Mon, 23 Apr 2012 13:43:34 GMT
Author: hwright
Date: Mon Apr 23 13:43:33 2012
New Revision: 1329234

URL: http://svn.apache.org/viewvc?rev=1329234&view=rev
Log:
Merge r1325914 from the ev2-export branch.

Modified:
    subversion/trunk/   (props changed)
    subversion/trunk/subversion/libsvn_delta/compat.c

Propchange: subversion/trunk/
------------------------------------------------------------------------------
  Merged /subversion/branches/ev2-export:r1325914

Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1329234&r1=1329233&r2=1329234&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Mon Apr 23 13:43:33 2012
@@ -1088,6 +1088,11 @@ svn_delta__delta_from_editor(const svn_d
     };
   struct ev2_edit_baton *eb = apr_pcalloc(pool, sizeof(*eb));
 
+  if (!base_relpath)
+    base_relpath = "";
+  else if (base_relpath[0] == '/')
+    base_relpath += 1;
+
   eb->editor = editor;
   eb->changes = apr_hash_make(pool);
   eb->paths = apr_hash_make(pool);
@@ -2038,6 +2043,11 @@ svn_delta__editor_from_delta(svn_editor_
   struct svn_delta__extra_baton *extra_baton = apr_pcalloc(result_pool,
                                                 sizeof(*extra_baton));
 
+  if (!base_relpath)
+    base_relpath = "";
+  else if (base_relpath[0] == '/')
+    base_relpath += 1;
+
   eb->deditor = deditor;
   eb->dedit_baton = dedit_baton;
   eb->edit_pool = result_pool;
@@ -2130,11 +2140,6 @@ svn_editor__insert_shims(const svn_delta
   SVN_ERR_ASSERT(shim_callbacks->fetch_props_func != NULL);
   SVN_ERR_ASSERT(shim_callbacks->fetch_base_func != NULL);
 
-  if (!base_relpath)
-    base_relpath = "";
-  else if (base_relpath[0] == '/')
-    base_relpath += 1;
-
   SVN_ERR(svn_delta__editor_from_delta(&editor, &exb,
                             &unlock_func, &unlock_baton,
                             deditor_in, dedit_baton_in,



Mime
View raw message