--- subversion/libsvn_client/externals.c	(revision 1177098)
+++ subversion/libsvn_client/externals.c	(working copy)
@@ -504,10 +504,8 @@
   return svn_error_trace(err);
 }
 
-/* Return the scheme of @a uri in @a scheme allocated from @a pool.
-   If @a uri does not appear to be a valid URI, then @a scheme will
-   not be updated.  */
 static svn_error_t *
+<<<<<<< .working
 uri_scheme(const char **scheme, const char *uri, apr_pool_t *pool)
 {
   apr_size_t i;
@@ -718,6 +716,8 @@
 }
 
 static svn_error_t *
+=======
+>>>>>>> .merge-right.r1174693
 handle_external_item_removal(const struct external_change_baton_t *eb,
                              const char *defining_abspath,
                              const char *local_abspath,
@@ -824,10 +824,17 @@
      iterpool, since the hash table values outlive the iterpool and
      any pointers they have should also outlive the iterpool.  */
 
+<<<<<<< .working
    SVN_ERR(resolve_relative_external_url(&new_url,
                                          new_item, eb->repos_root_url,
                                          parent_dir_url,
                                          scratch_pool, scratch_pool));
+=======
+  SVN_ERR(svn_wc__resolve_relative_external_url(&new_url,
+                                                new_item, eb->repos_root_url,
+                                                parent_dir_url,
+                                                scratch_pool, scratch_pool));
+>>>>>>> .merge-right.r1174693
 
   /* If the external is being checked out, exported or updated,
      determine if the external is a file or directory. */
@@ -1219,9 +1226,10 @@
           item_abspath = svn_dirent_join(local_abspath, item->target_dir,
                                          sub_iterpool);
 
-          SVN_ERR(resolve_relative_external_url(&new_url, item,
-                                                repos_root_url, dir_url,
-                                                sub_iterpool, sub_iterpool));
+          SVN_ERR(svn_wc__resolve_relative_external_url(&new_url, item,
+                                                        repos_root_url,
+                                                        dir_url, sub_iterpool,
+                                                        sub_iterpool));
 
           /* The target dir might have multiple components.  Guarantee
              the path leading down to the last component. */