chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
140e8c8
)
dgit: Add a comment explaining import discard
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 29 Aug 2016 23:06:14 +0000
(
00:06
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 5 Sep 2016 23:31:48 +0000
(
00:31
+0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index d3b2ec7ee5cfde2e9c36d05efa6fba4d340a8ef8..b59d00a9effe3cc84eaeaffee1b1f778d384f628 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1549,6
+1549,9
@@
$later_warning_msg
END
@output = $lastpush_mergeinput;
} else {
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;
}
}
@output = $lastpush_mergeinput;
}
}