git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Vandiver <alexmv@MIT.EDU>
To: git@vger.kernel.org
Cc: Alex Vandiver <alexmv@MIT.EDU>
Subject: [PATCH 1/2] git-svn: Fix for svn paths removed > log-window-size revisions ago
Date: Wed,  6 May 2009 16:18:52 -0400	[thread overview]
Message-ID: <1241641133-6974-1-git-send-email-alexmv@mit.edu> (raw)

Instead of trying to find the end of the commit history only in the
last window, track if we have seen commits yet, and use that to judge
if we need to backtrack and look for a tail.  Otherwise, conversion
can silently lose up to 100 revisions of a branch if it was deleted
>100 revisions ago.

Signed-off-by: Alex Vandiver <alexmv@mit.edu>
---
 git-svn.perl |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index ef1d30d..5836dde 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4438,6 +4438,7 @@ sub gs_fetch_loop_common {
 	my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
 	my $longest_path = longest_common_path($gsv, $globs);
 	my $ra_url = $self->{url};
+	my $find_trailing_edge;
 	while (1) {
 		my %revs;
 		my $err;
@@ -4455,8 +4456,10 @@ sub gs_fetch_loop_common {
 		               sub { $revs{$_[1]} = _cb(@_) });
 		if ($err) {
 			print "Checked through r$max\r";
+		} else {
+			$find_trailing_edge = 1;
 		}
-		if ($err && $max >= $head) {
+		if ($err and $find_trailing_edge) {
 			print STDERR "Path '$longest_path' ",
 				     "was probably deleted:\n",
 				     $err->expanded_message,
@@ -4475,6 +4478,7 @@ sub gs_fetch_loop_common {
 					last;
 				}
 			}
+			$find_trailing_edge = 0;
 		}
 		$SVN::Error::handler = $err_handler;
 
-- 
1.6.3.rc4.225.g060aa4

             reply	other threads:[~2009-05-06 20:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-06 20:18 Alex Vandiver [this message]
2009-05-06 20:18 ` [PATCH 2/2] git-svn: Correctly report max revision when following deleted paths Alex Vandiver
2009-05-10  1:32 ` [PATCH 1/2] git-svn: Fix for svn paths removed > log-window-size revisions ago Eric Wong

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=1241641133-6974-1-git-send-email-alexmv@mit.edu \
    --to=alexmv@mit.edu \
    --cc=git@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).