subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1355751 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Date Sat, 30 Jun 2012 15:50:12 GMT
Author: rhuijben
Date: Sat Jun 30 15:50:11 2012
New Revision: 1355751

URL: http://svn.apache.org/viewvc?rev=1355751&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
  (create_tree_conflict): Don't verify if our single caller retrieved the same
    data from the db. It used the same function.

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

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1355751&r1=1355750&r2=1355751&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sat Jun 30 15:50:11 2012
@@ -1310,7 +1310,6 @@ create_tree_conflict(svn_skel_t **pconfl
   const char *left_repos_relpath;
   svn_revnum_t left_revision;
   svn_node_kind_t left_kind;
-  const char *added_repos_relpath = NULL;
   svn_wc_conflict_version_t *src_left_version;
 
   *pconflict = NULL;
@@ -1323,8 +1322,6 @@ create_tree_conflict(svn_skel_t **pconfl
   if (reason == svn_wc_conflict_reason_added ||
       reason == svn_wc_conflict_reason_moved_here)
     {
-      svn_wc__db_status_t added_status;
-
       /* ###TODO: It would be nice to tell the user at which URL and
        * ### revision source-left was empty, which could be quite difficult
        * ### to code, and is a slight theoretical leap of the svn mind.
@@ -1342,20 +1339,6 @@ create_tree_conflict(svn_skel_t **pconfl
       left_kind = svn_node_none;
       left_revision = SVN_INVALID_REVNUM;
       left_repos_relpath = NULL;
-
-      /* Still get the repository root needed by both 'update' and 'switch',
-       * and the would-be repos_relpath needed to construct the source-right
-       * in case of an 'update'. Check sanity while we're at it. */
-      SVN_ERR(svn_wc__db_scan_addition(&added_status, NULL,
-                                       &added_repos_relpath, NULL, NULL,
-                                       NULL, NULL, NULL, NULL, NULL,
-                                       NULL, eb->db, local_abspath,
-                                       result_pool, scratch_pool));
-
-      /* This better really be an added status. */
-      SVN_ERR_ASSERT(added_status == svn_wc__db_status_added
-                     || added_status == svn_wc__db_status_copied
-                     || added_status == svn_wc__db_status_moved_here);
     }
   else if (reason == svn_wc_conflict_reason_unversioned)
     {



Mime
View raw message