From 6ebc225def00c400db654fa7fa562725432fe3a7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 30 Aug 2016 00:06:14 +0100 Subject: [PATCH] dgit: Add a comment explaining import discard Signed-off-by: Ian Jackson --- dgit | 3 +++ 1 file changed, 3 insertions(+) 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; } } -- 2.30.2