All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Ramkumar Ramachandra <artagnon@gmail.com>,
	Sverre Rabbelier <srabbelier@gmail.com>,
	David Barr <david.barr@cordelta.com>
Subject: Re: [PATCH 11/15] vcs-svn: More dump format sanity checks
Date: Tue, 30 Nov 2010 13:48:33 -0600	[thread overview]
Message-ID: <20101130194833.GA9064@burratino> (raw)
In-Reply-To: <20101120005334.GL17445@burratino>

Jonathan Nieder wrote:

> --- a/vcs-svn/svndump.c
> +++ b/vcs-svn/svndump.c
> @@ -181,12 +181,22 @@ static void handle_node(void)
[...]
> +		if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
> +			die("invalid dump: cannot modify a directory into a file");

This is tripping for me in a revision like so:

 Revision-number: 692
 Prop-content-length: 110
 Content-length: 110

 [revprops snipped]

 Node-path: lxanew/DCNsnetwork.cpp
 Node-kind: file
 Node-action: add
 Node-copyfrom-rev: 691
 Node-copyfrom-path: DCNsnetwork.cpp


 Node-path: DCNsnetwork.cpp
 Node-action: delete

The import up to and including rev 691 works fine.  Rev 691:

 Revision-number: 691
 Prop-content-length: 110
 Content-length: 110

[props snipped]

 Node-path: lxanew/CorpusWordCollection.cpp
 Node-kind: file
 Node-action: add
 Node-copyfrom-rev: 690
 Node-copyfrom-path: CorpusWordCollection.cpp


 Node-path: CorpusWordCollection.cpp
 Node-action: delete

Pretty similar, right?  In the target repository:

 $ git ls-tree HEAD -- DCNsnetwork.cpp
 100644 blob f92d77cc88cc50e9ca333604d22db83f0668828a    DCNsnetwork.cpp

DCNsnetwork.cpp was added in r688, which looks like so:

 Revision-number: 688
 Prop-content-length: 186
 Content-length: 186

[props and many new files snipped]

 Node-path: DCNsnetwork.cpp
 Node-kind: file
 Node-action: add
 Prop-delta: true
 Prop-content-length: 10
 Text-delta: true
 Text-content-length: 2999
 Text-content-md5: 48fd4d31d16f90ab449b4d223fc3d7f8
 Content-length: 3009

 PROPS-END
 SVN^@^@^@<97>)^C<97>)<80><97>)// snetwork.cpp: implementation of the snetwork class.
 [...]

So apparently repo_add failed.  Hints?

Here's an unrelated simplification, noticed while debugging.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index d0d3de6..d1ec9a5 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -219,6 +219,7 @@ static void handle_node(void)
 			die("invalid dump: adds node without text");
 		repo_add(node_ctx.dst, type, mark);
 		old_mark = 0;
+		node_ctx.type = type;
 	} else {
 		die("invalid dump: Node-path block lacks Node-action");
 	}

  reply	other threads:[~2010-11-30 19:49 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-18  5:00 [PATCH 0/2] svn-fe: recognize v3 dumps Jonathan Nieder
2010-11-18  5:02 ` [PATCH 1/2] vcs-svn: Error out for " Jonathan Nieder
2010-11-18  5:03 ` [PATCH 2/2] vcs-svn: Allow simple v3 dumps (no deltas yet) Jonathan Nieder
2010-11-20  0:45 ` [RFC/PATCH 0/15] svn-fe: support for property deltas (but not text " Jonathan Nieder
2010-11-20  0:46   ` [PATCH 01/15] vcs-svn: Check for errors from open() Jonathan Nieder
2010-11-20  0:46   ` [PATCH 02/15] vcs-svn: Eliminate node_ctx.srcRev global Jonathan Nieder
2010-11-20  0:46   ` [PATCH 03/15] vcs-svn: Eliminate node_ctx.mark global Jonathan Nieder
2010-11-20  0:47   ` [PATCH 04/15] vcs-svn: Unclutter handle_node by introducing have_props var Jonathan Nieder
2010-11-20  0:48   ` [PATCH 05/15] vcs-svn: Use mark to indicate nodes with included text Jonathan Nieder
2010-11-20  0:49   ` [PATCH 06/15] vcs-svn: handle_node: Handle deletion case early Jonathan Nieder
2010-11-20  0:49   ` [PATCH 07/15] vcs-svn: Replace = Delete + Add Jonathan Nieder
2010-11-20  0:51   ` [PATCH 08/15] vcs-svn: Combine repo_replace and repo_modify functions Jonathan Nieder
2010-11-20  0:52   ` [PATCH 09/15] vcs-svn: Delay read of per-path properties Jonathan Nieder
2010-11-20  0:52   ` [PATCH 10/15] vcs-svn: Reject path nodes without Node-action Jonathan Nieder
2010-11-20 14:53     ` Jonathan Nieder
2010-11-20  0:53   ` [PATCH 11/15] vcs-svn: More dump format sanity checks Jonathan Nieder
2010-11-30 19:48     ` Jonathan Nieder [this message]
     [not found]       ` <20101205091605.GA4332@burratino>
2010-12-05  9:32         ` [PATCH 2/2] vcs-svn: fix intermittent repo_tree corruption Jonathan Nieder
2010-12-05  9:33       ` [PATCH jn/svn-fe-maint 0/2] " Jonathan Nieder
2010-12-05  9:35         ` [PATCH 1/2] treap: make treap_insert return inserted node Jonathan Nieder
2010-12-06 22:19     ` [PATCH jn/svn-fe] vcs-svn: Allow change nodes for root of tree (/) Jonathan Nieder
2010-12-06 23:12       ` Jonathan Nieder
2010-11-20  0:53   ` [PATCH 12/15] vcs-svn: Make source easier to read on small screens Jonathan Nieder
2010-11-20  0:54   ` [PATCH 13/15] vcs-svn: Split off function for handling of individual properties Jonathan Nieder
2010-11-20  0:54   ` [PATCH 14/15] vcs-svn: Sharpen parsing of property lines Jonathan Nieder
2010-11-20  0:57   ` [PATCH 15/15] vcs-svn: Implement Prop-delta handling Jonathan Nieder
2010-11-20 19:21   ` [WIP/PATCH 0/8] svn-fe: support for text deltas Jonathan Nieder
2010-11-20 19:22     ` [PATCH 1/8] svn-fe: Prepare for strbuf use Jonathan Nieder
2010-11-20 19:25     ` [PATCH 2/8] vcs-svn: Internal fast_export_save_blob helper Jonathan Nieder
2010-11-20 19:25     ` [PATCH 3/8] vcs-svn: Introduce repo_read_path to check the content at a path Jonathan Nieder
2011-03-06 12:29       ` Jonathan Nieder
2010-11-20 19:26     ` [PATCH 4/8] vcs-svn: Introduce fd_buffer routines Jonathan Nieder
2010-11-20 19:27     ` [PATCH 5/8] vcs-svn: Read delta preimage from file descriptor Jonathan Nieder
2010-11-20 19:28     ` [PATCH 6/8] vcs-svn: Let caller set up sliding window for delta preimage Jonathan Nieder
2010-11-20 19:31       ` Jonathan Nieder
2010-11-20 19:29     ` [PATCH 7/8] vcs-svn: Teach line_buffer about temporary files Jonathan Nieder
2010-11-20 19:29     ` [PATCH 8/8] vcs-svn: Implement text-delta handling Jonathan Nieder
2010-12-04 17:34       ` [PATCH 10/8] vcs-svn: Consume whole preimage when applying deltas Jonathan Nieder
2010-11-20 19:30     ` [PATCH 9/8] svn-fe: Test script for handling of dumps with --deltas Jonathan Nieder
2010-12-04 17:29       ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101130194833.GA9064@burratino \
    --to=jrnieder@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=david.barr@cordelta.com \
    --cc=git@vger.kernel.org \
    --cc=srabbelier@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.