subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1592743 - /subversion/trunk/tools/diff/diff3.c
Date Tue, 06 May 2014 13:31:21 GMT
Author: philip
Date: Tue May  6 13:31:21 2014
New Revision: 1592743

URL: http://svn.apache.org/r1592743
Log:
* tools/diff/diff3.c
  (main): Generate a better parse error.

Modified:
    subversion/trunk/tools/diff/diff3.c

Modified: subversion/trunk/tools/diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff3.c?rev=1592743&r1=1592742&r2=1592743&view=diff
==============================================================================
--- subversion/trunk/tools/diff/diff3.c (original)
+++ subversion/trunk/tools/diff/diff3.c Tue May  6 13:31:21 2014
@@ -141,7 +141,8 @@ int main(int argc, const char *argv[])
           else if (!conflict_latest)
             conflict_latest = apr_pstrcat(pool, ">>>>>>> ", arg, SVN_VA_NULL);
           else
-            svn_err = svn_error_wrap_apr(status, "getopt failure");
+            svn_err = svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                                       "too many lables");
           break;
         case 'E':
         case 'm':



Mime
View raw message