chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Test suite: inarchivecopy: Is finished
[dgit.git]
/
dgit
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 {
+ # 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;
}
}