subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1578670 - /subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
Date Mon, 17 Mar 2014 23:54:57 GMT
Author: philip
Date: Mon Mar 17 23:54:57 2014
New Revision: 1578670

URL: http://svn.apache.org/r1578670
Log:
Fix the order of node record headers written by svndumpfilter.

Reported by: "Brown, Jonathan W" <JonathanW.Brown{_AT_}nuance.com>

* subversion/svndumpfilter/svndumpfilter.c
  (new_node_record): Output 'Node-path' first.

Modified:
    subversion/trunk/subversion/svndumpfilter/svndumpfilter.c

Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1578670&r1=1578669&r2=1578670&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Mon Mar 17 23:54:57 2014
@@ -623,6 +623,11 @@ new_node_record(void **node_baton,
       if (! nb->rb->writing_begun)
         SVN_ERR(output_revision(nb->rb));
 
+      /* A node record is required to begin with 'Node-path'. */
+      SVN_ERR(svn_stream_printf(nb->rb->pb->out_stream,
+                                pool, "%s: %s\n",
+                                SVN_REPOS_DUMPFILE_NODE_PATH, node_path));
+
       for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi))
         {
           const char *key = svn__apr_hash_index_key(hi);
@@ -638,7 +643,8 @@ new_node_record(void **node_baton,
 
           if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH))
               || (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH))
-              || (!strcmp(key, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH)))
+              || (!strcmp(key, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH))
+              || (!strcmp(key, SVN_REPOS_DUMPFILE_NODE_PATH)))
             continue;
 
           /* Rewrite Node-Copyfrom-Rev if we are renumbering revisions.



Mime
View raw message