chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Clarify some messages about archive/local skew
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index f038da35167abebf1bc66dd1d38bd5c0fd86acc2..d3b2ec7ee5cfde2e9c36d05efa6fba4d340a8ef8 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1543,8
+1543,8
@@
END
} elsif ($vcmp > 0) {
print STDERR <<END or die $!;
} elsif ($vcmp > 0) {
print STDERR <<END or die $!;
-Version actually in archive:
$cversion (older)
-Last
allegedly pushed/uploaded
: $oversion (newer or same)
+Version actually in archive: $cversion (older)
+Last
version pushed with dgit
: $oversion (newer or same)
$later_warning_msg
END
@output = $lastpush_mergeinput;
$later_warning_msg
END
@output = $lastpush_mergeinput;
@@
-1773,8
+1773,8
@@
sub fetch_from_archive () {
print STDERR <<END or die $!;
Git commit in archive is behind the last version allegedly pushed/uploaded.
print STDERR <<END or die $!;
Git commit in archive is behind the last version allegedly pushed/uploaded.
-Commit referred to by archive:
$dsc_hash
-Last
allegedly pushed/uploaded
: $lastpush_hash
+Commit referred to by archive: $dsc_hash
+Last
version pushed with dgit
: $lastpush_hash
$later_warning_msg
END
@mergeinputs = ($lastpush_mergeinput);
$later_warning_msg
END
@mergeinputs = ($lastpush_mergeinput);