summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-08-30 00:05:46 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-06 00:31:48 +0100
commit140e8c84b7e36eacbf9802c8a04f40eb32ef59ce (patch)
tree63e883fd965ec7b15b28e7abd739bd330e4d1cd4
parentc226efe2ca372f479fc70f88a90e9bc0a9fab7b3 (diff)
dgit: Clarify some messages about archive/local skew
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit8
1 files changed, 4 insertions, 4 deletions
diff --git a/dgit b/dgit
index f038da3..d3b2ec7 100755
--- a/dgit
+++ b/dgit
@@ -1543,8 +1543,8 @@ END
} 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;
@@ -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.
-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);