diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-11-28 17:43:33 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 16:47:47 +0100 |
| commit | 57b7ccba1b4e833e9ffc91efe0afe550138f530d (patch) | |
| tree | d5f473939bb5faf6dc18071bf1b4a534b0fa660f /dgit.1 | |
| parent | 1d90ef8b49ccf6156953d7595d33680276a8e8c7 (diff) | |
Split brain: some work on integration into the rest of dgit
* Move the fast forward die to where we will need to make the
synthetic commit, so that the tree equality check is done on the
thing we will actually push.
* Crash if we are trying to do split brain without split build.
(This should never happen.)
* Set split build if we need split brain.
Diffstat (limited to 'dgit.1')
0 files changed, 0 insertions, 0 deletions