From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 31 Jan 2007 11:45:28 +0000 (-0800)
Subject: git-svn: gracefully handle --follow-parent failures
X-Git-Tag: v1.5.1-rc1~204
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c7eba7163b452840c8492b9ad87846b44cc98ea7;p=git.git

git-svn: gracefully handle --follow-parent failures

We don't always know that a path will exist at a particular
revision.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index cc5736d79..b2f86e84b 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1055,8 +1055,11 @@ sub find_parent_branch {
 	my ($self, $paths, $rev) = @_;
 	return undef unless $_follow_parent;
 	unless (defined $paths) {
+		my $err_handler = $SVN::Error::handler;
+		$SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
 		$self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
 		                   sub { $paths = dup_changed_paths($_[0]) });
+		$SVN::Error::handler = $err_handler;
 	}
 	return undef unless defined $paths;