mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 06:26:13 +02:00
Code

contrib/git-svn: allow rebuild to work on non-linear remote heads 

Because committing back to an SVN repository from different
machines can result in different lineages, two different
repositories running git-svn can result in different commit
SHA1s (but of the same tree).  Sometimes trees that are tracked
independently are merged together (usually via children),
resulting in non-unique git-svn-id: lines in rev-list.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric Wong 2006-03-20 20:51:16 -08:00 committed by Junio C Hamano
parent a3c57c9adb
commit ac74905064
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -850,11 +850,23 @@ sub assert_revision_unknown {
}
}
sub trees_eq {
my ($x, $y) = @_;
my @x = safe_qx('git-cat-file','commit',$x);
my @y = safe_qx('git-cat-file','commit',$y);
if (($y[0] ne $x[0]) || $x[0] !~ /^tree $sha1\n$/
|| $y[0] !~ /^tree $sha1\n$/) {
print STDERR "Trees not equal: $y[0] != $x[0]\n";
return 0
}
return 1;
}
sub assert_revision_eq_or_unknown {
my ($revno, $commit) = @_;
if (-f "$REV_DIR/$revno") {
my $current = file_to_s("$REV_DIR/$revno");
if ($commit ne $current) {
if (($commit ne $current) && !trees_eq($commit, $current)) {
croak "$REV_DIR/$revno already exists!\n",
"current: $current\nexpected: $commit\n";
}