summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-31 03:45:28 -0800
committerEric Wong <normalperson@yhbt.net>2007-02-23 00:57:11 -0800
commitc7eba7163b452840c8492b9ad87846b44cc98ea7 (patch)
tree9ffac74ffa85adb4b569e416d11f987ea9dcac09 /git-svn.perl
parent9760adccccc0cc4dccc2f28765611550db640ceb (diff)
downloadgit-c7eba7163b452840c8492b9ad87846b44cc98ea7.tar.gz
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>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index cc5736d793..b2f86e84b4 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;