Perhaps the upload is stuck in incoming. Using the version from git.
END
$outputhash = $upload_hash;
- } else {
- die "version in archive is same as version in git".
- " to-be-uploaded (upload/) branch but archive".
- " version hash no commit hash?!\n";
+ } elsif ($outputhash ne $upload_hash) {
+ die "version in archive ($clogp->{Version})".
+ " is same as version in git".
+ " to-be-uploaded (upload/) branch ($oldclogp->{Version})".
+ " but archive version hash no commit hash?!\n";
}
}
chdir '../../../..' or die $!;
} else {
die "$lrref_fn $!";
}
- print DEBUG "last upload hash $upload_hash\n";
+ print DEBUG "previous reference hash $upload_hash\n";
my $hash;
if (defined $dsc_hash) {
die "missing git history even though dsc has hash"
fetch();
runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
lrref();
- print "dgit ok: fetched to ".lrref()." and merged into HEAD\n";
+ printdone "fetched to ".lrref()." and merged into HEAD";
}
sub dopush () {