summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-06-03 09:56:33 (GMT)
committerEric Wong <normalperson@yhbt.net>2006-06-16 10:04:19 (GMT)
commitb63af9b340dd831840c70103c9f609940a910031 (patch)
treee45604bd4cf8ce16a59bc6defd2dd28c1265c050
parentce475dfcb5021339d8545a020e8697dd35a1bbea (diff)
downloadgit-b63af9b340dd831840c70103c9f609940a910031.zip
git-b63af9b340dd831840c70103c9f609940a910031.tar.gz
git-b63af9b340dd831840c70103c9f609940a910031.tar.bz2
git-svn: don't allow commit if svn tree is not current
If new revisions are fetched, that implies we haven't merged, acked, or nacked them yet, and attempting to write the tree we're committing means we'd silently clobber the newly fetched changes. Signed-off-by: Eric Wong <normalperson@yhbt.net>
-rwxr-xr-xcontrib/git-svn/git-svn.perl11
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index 8bc3d69..72129de 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -309,9 +309,16 @@ sub commit {
}
chomp @revs;
- fetch();
- chdir $SVN_WC or croak $!;
+ chdir $SVN_WC or croak "Unable to chdir $SVN_WC: $!\n";
my $info = svn_info('.');
+ my $fetched = fetch();
+ if ($info->{Revision} != $fetched->{revision}) {
+ print STDERR "There are new revisions that were fetched ",
+ "and need to be merged (or acknowledged) ",
+ "before committing.\n";
+ exit 1;
+ }
+ $info = svn_info('.');
read_uuid($info);
my $svn_current_rev = $info->{'Last Changed Rev'};
foreach my $c (@revs) {