chiark / gitweb /
pseudomerge: Suppress checks in split brain mode with --overwrite
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Oct 2016 00:33:38 +0000 (01:33 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 18 Oct 2016 00:44:23 +0000 (01:44 +0100)
commit06ef121b4141a3bd8f9b2ff4c0afc4493696753c
treec611c281ff1d1644031a9f06622a795c88f55e4e
parent12da50e85e2fe58f537d8eb1c3b06f1377e373c9
pseudomerge: Suppress checks in split brain mode with --overwrite

If the user has specified an appropriate --overwrite (=VERSION with
the archive's version, or without a version and the archive's version
being in debian/changelog), do not do all the automatic checks.

Instead, in this case, simply make the dgit view be a descendant of
the archive, as instructed.

Closes:#841101.

When generating split brain pseudomerge with --overwrite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit