mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 17:03:56 +01:00
Code

git-svn: don't allow commit if svn tree is not current

Browse Source 
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>
This commit is contained in:
Eric Wong 2006-06-03 02:56:33 -07:00
parent ce475dfcb5
commit b63af9b340
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/git-svn/git-svn.perl
View File

@ -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) {