chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2223785) | patch
dgit: Reject dgit pull in split brain mode
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 14:13:52 +0000 (15:13 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 15:59:49 +0000 (16:59 +0100)
commitc83c5cca4728c7c9a79e145a6fa4183dd73ad7c6
tree73a13c64bdbf486740f1af2269f7ab0eb455f6aetree | snapshot
parent222378544900b50217a2f3cf80478639a074beeecommit | diff
dgit: Reject dgit pull in split brain mode

In splitting quilt modes dgit pull would have to back-convert the
changes and currently there is no code to do this, and these cases
were correctly rejected before.

But in other quilt modes it would still have to strip off pseudomerges
or quilt fixup commits.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.