svn commit: r1930411 - in subversion/branches/1.14.x: . subversion/libsvn_subr

Author: svn-role
Date: Wed Dec 10 04:00:05 2025
New Revision: 1930411

Log:
Merge r1930381 from trunk:

 * r1930381
   Fix wrong line numbers displayed in syntax errors from config file parser.
   Justification:
     Cosmetic issue which can confuse users in case of syntax errors.
   Votes:
     +1: stsp, brane, dsahlberg

Modified:
   subversion/branches/1.14.x/   (props changed)
   subversion/branches/1.14.x/STATUS
   subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c

Modified: subversion/branches/1.14.x/STATUS
==============================================================================
--- subversion/branches/1.14.x/STATUS	Wed Dec 10 02:45:37 2025	(r1930410)
+++ subversion/branches/1.14.x/STATUS	Wed Dec 10 04:00:05 2025	(r1930411)
@@ -56,11 +56,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1930381
-   Fix wrong line numbers displayed in syntax errors from config file parser.
-   Justification:
-     Cosmetic issue which can confuse users in case of syntax errors.
-   Votes:
-     +1: stsp, brane, dsahlberg
-

Modified: subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c	Wed Dec 10 02:45:37 2025	(r1930410)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/config_file.c	Wed Dec 10 04:00:05 2025	(r1930411)
@@ -807,6 +807,7 @@ svn_config__parse_stream(svn_stream_t *s
           SVN_ERR(open_section(ctx, &stop));
           if (stop)
             return SVN_NO_ERROR;
+          ++(ctx->line);
           break;
 
         case '#':               /* Comment */