subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1683273 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Date Wed, 03 Jun 2015 10:12:34 GMT
Author: julianfoad
Date: Wed Jun  3 10:12:33 2015
New Revision: 1683273

URL: http://svn.apache.org/r1683273
Log:
On the 'move-tracking-2' branch: Tweak error messages.

* subversion/svnmover/svnmover.c
  (VERIFY_EID_NONEXISTENT,
   VERIFY_PARENT_EID_EXISTS): Refer primarily to an 'element' rather
    than a 'path'.
  (VERIFY_EID_EXISTS): Same, and indicate that a revision was specified
    if one was. (The other two macros are not currently used where a
    revision may be specified.)

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1683273&r1=1683272&r2=1683273&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Jun  3 10:12:33
2015
@@ -2054,19 +2054,21 @@ typedef struct arg_t
 #define VERIFY_EID_NONEXISTENT(op, i)                                   \
   if (arg[i]->el_rev->eid != -1)                                        \
     return svn_error_createf(SVN_ERR_BRANCHING, NULL,                   \
-                             _("%s: Path '%s' already exists"),         \
+                             _("%s: Element already exists at path '%s'"), \
                              op, action->relpath[i]);
 
 #define VERIFY_EID_EXISTS(op, i)                                        \
   if (arg[i]->el_rev->eid == -1)                                        \
     return svn_error_createf(SVN_ERR_BRANCHING, NULL,                   \
-                             _("%s: Path '%s' not found"),              \
-                             op, action->relpath[i]);
+                             _("%s: Element not found at path '%s%s'"), \
+                             op, action->relpath[i],                    \
+                             action->rev_spec[i].kind == svn_opt_revision_unspecified
\
+                               ? "" : "@...");
 
 #define VERIFY_PARENT_EID_EXISTS(op, i)                                 \
   if (arg[i]->parent_el_rev->eid == -1)                                 \
     return svn_error_createf(SVN_ERR_BRANCHING, NULL,                   \
-                             _("%s: Path '%s' not found"),              \
+                             _("%s: Element not found at path '%s'"),   \
                              op, svn_relpath_dirname(action->relpath[i], pool));
 
 #define is_branch_root_element(branch, eid) \



Mime
View raw message