Test suite: inarchivecopy: Is finished

[dgit.git] / dgit

diff --git a/dgit b/dgit
index f038da35167abebf1bc66dd1d38bd5c0fd86acc2..b59d00a9effe3cc84eaeaffee1b1f778d384f628 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1543,12 +1543,15 @@ 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;
         } else {
+           # Same version.  Use what's in the server git branch,
+           # discarding our own import.  (This could happen if the
+           # server automatically imports all packages into git.)
            @output = $lastpush_mergeinput;
        }
     }
@@ -1773,8 +1776,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);