From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 29 Aug 2016 23:05:46 +0000 (+0100)
Subject: dgit: Clarify some messages about archive/local skew
X-Git-Tag: archive/debian/2.0~201
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=140e8c84b7e36eacbf9802c8a04f40eb32ef59ce;hp=c226efe2ca372f479fc70f88a90e9bc0a9fab7b3;p=dgit.git

dgit: Clarify some messages about archive/local skew

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index f038da35..d3b2ec7e 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);