Commit 10945e00 authored by Eric Wong's avatar Eric Wong Committed by Martin Langhoff

archimport: fix a in new changeset applyer addition

Fix a stupid bug I introduced when splitting the
accurate and fast changeset appliers.

Also, remove an old debugging statement I added
Signed-off-by: 's avatarEric Wong <normalperson@yhbt.net>
Signed-off-by: 's avatarMartin Langhoff <martin@catalyst.net.nz>
parent 6e33101a
......@@ -499,7 +499,7 @@ sub process_patchset_fast {
#
if (ptag($ps->{id})) {
$opt_v && print " * Skipping already imported: $ps->{id}\n";
return 0;
next;
}
print " * Starting to work on $ps->{id}\n";
......@@ -578,10 +578,6 @@ sub process_patchset_fast {
print " + commit $commitid\n";
$opt_v && print " + commit date is $ps->{date} \n";
$opt_v && print " + parents: ",join(' ',@par),"\n";
if (my $dirty = `git-diff-files`) {
die "22 Unclean tree when about to process $ps->{id} " .
" - did we fail to commit cleanly before?\n$dirty";
}
}
if ($opt_v) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment