[PATCH 1/2] git-svn: Fix for svn paths removed > log-window-size revisions ago
From: Alex Vandiver <hidden>
Date: 2016-06-15 22:46:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- 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