From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 29 Aug 2016 23:06:14 +0000 (+0100)
Subject: dgit: Add a comment explaining import discard
X-Git-Tag: archive/debian/2.0~200
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6ebc225def00c400db654fa7fa562725432fe3a7

dgit: Add a comment explaining import discard

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

diff --git a/dgit b/dgit
index d3b2ec7e..b59d00a9 100755
--- a/dgit
+++ b/dgit
@@ -1549,6 +1549,9 @@ $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;
 	}
     }