summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-08-30 00:06:14 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-06 00:31:48 +0100
commit6ebc225def00c400db654fa7fa562725432fe3a7 (patch)
treef3abacd9340a3b6486630f8439d0f6fa026499d3 /dgit
parent140e8c84b7e36eacbf9802c8a04f40eb32ef59ce (diff)
dgit: Add a comment explaining import discard
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit3
1 files changed, 3 insertions, 0 deletions
diff --git a/dgit b/dgit
index d3b2ec7..b59d00a 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;
}
}