subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1222693 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Date Fri, 23 Dec 2011 14:41:21 GMT
Author: stsp
Date: Fri Dec 23 14:41:20 2011
New Revision: 1222693

URL: http://svn.apache.org/viewvc?rev=1222693&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (read_children_info): Now that the repos_id problem is better understood
   (see issue #4087), simplify the associated error message.

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=1222693&r1=1222692&r2=1222693&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Dec 23 14:41:20 2011
@@ -7325,28 +7325,10 @@ read_children_info(void *baton,
                 return svn_error_createf(
                          SVN_ERR_WC_DB_ERROR, NULL,
                          _("The node '%s' comes from unexpected repository "
-                           "(ID '%" APR_INT64_T_FMT "'%s%s, expected ID '%"
-                           APR_INT64_T_FMT"'%s%s); this could be a "
-                           "misconfigured file-external which points to a "
-                           "foreign repository"),
-                         child_relpath, repos_id,
-                         repos_root_url
-                           ? apr_psprintf(scratch_pool, ", URL '%s'",
-                                          repos_root_url)
-                           : "",
-                         repos_uuid
-                           ? apr_psprintf(scratch_pool, ", UUID '%s'",
-                                          repos_uuid)
-                           : "",
-                         last_repos_id,
-                         last_repos_root_url
-                           ? apr_psprintf(scratch_pool, ", URL '%s'",
-                                          last_repos_root_url)
-                           : "",
-                         last_repos_uuid
-                           ? apr_psprintf(scratch_pool, ", UUID '%s'",
-                                          last_repos_uuid)
-                           : "");
+                           "'%s', expected '%s'; if this node is a file "
+                           "external using the correct URL in the external "
+                           "definition can fix the problem, see issue #4087"),
+                         child_relpath, repos_root_url, last_repos_root_url);
               child->repos_root_url = repos_root_url;
               child->repos_uuid = repos_uuid;
             }



Mime
View raw message