subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1845642 - in /subversion/branches/1.11.x: ./ STATUS subversion/svndumpfilter/svndumpfilter.c
Date Sat, 03 Nov 2018 04:00:23 GMT
Author: svn-role
Date: Sat Nov  3 04:00:23 2018
New Revision: 1845642

URL: http://svn.apache.org/viewvc?rev=1845642&view=rev
Log:
Merge r1845261 from trunk:

 * r1845261
   svndumpfilter: Include node path in error messages.
   Justification:
     User requested error message clarification.
   Votes:
     +1: danielsh, rhuijben, brane

Modified:
    subversion/branches/1.11.x/   (props changed)
    subversion/branches/1.11.x/STATUS
    subversion/branches/1.11.x/subversion/svndumpfilter/svndumpfilter.c

Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov  3 04:00:23 2018
@@ -100,4 +100,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1845204,1845261

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845642&r1=1845641&r2=1845642&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sat Nov  3 04:00:23 2018
@@ -43,13 +43,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1845261
-   svndumpfilter: Include node path in error messages.
-   Justification:
-     User requested error message clarification.
-   Votes:
-     +1: danielsh, rhuijben, brane
-
  * r1845408
    Prevent some coredumps when using JavaHL SVNClient::diff().
    Justification:

Modified: subversion/branches/1.11.x/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/svndumpfilter/svndumpfilter.c?rev=1845642&r1=1845641&r2=1845642&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/branches/1.11.x/subversion/svndumpfilter/svndumpfilter.c Sat Nov  3 04:00:23
2018
@@ -530,7 +530,8 @@ new_node_record(void **node_baton,
             {
               return svn_error_createf
                 (SVN_ERR_INCOMPLETE_DATA, 0,
-                 _("Invalid copy source path '%s'"), copyfrom_path);
+                 _("Invalid copy source path '%s' for '%s'"),
+                 copyfrom_path, node_path);
             }
         }
 
@@ -611,7 +612,8 @@ new_node_record(void **node_baton,
               if (! (cf_renum_val && SVN_IS_VALID_REVNUM(cf_renum_val->rev)))
                 return svn_error_createf
                   (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
-                   _("No valid copyfrom revision in filtered stream"));
+                   _("No valid copyfrom revision in filtered stream for '%s'"),
+                   node_path);
               svn_repos__dumpfile_header_pushf(
                 nb->headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV,
                 "%ld", cf_renum_val->rev);



Mime
View raw message