X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=contrib%2Fgit-svn%2Fgit-svn.perl;h=54f3d6312eadce9ae5fc59139ccd7e728c479025;hp=d4b9323694e115a8005d464c1518a1880f47ccc8;hb=6dfbe5163e26e3e1126c9b08c3cb38195e92a82c;hpb=098749d9bee6694abc8a0991996ff94b607abc7f

diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index d4b93236..54f3d631 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -262,7 +262,14 @@ sub fetch {
 	} else {
 		chdir $SVN_WC or croak $!;
 		read_uuid();
-		$last_commit = file_to_s("$REV_DIR/$base->{revision}");
+		eval { $last_commit = file_to_s("$REV_DIR/$base->{revision}") };
+		# looks like a user manually cp'd and svn switch'ed
+		unless ($last_commit) {
+			sys(qw/svn revert -R ./);
+			assert_svn_wc_clean($base->{revision});
+			$last_commit = git_commit($base, @parents);
+			assert_tree($last_commit);
+		}
 	}
 	my @svn_up = qw(svn up);
 	push @svn_up, '--ignore-externals' unless $_no_ignore_ext;