diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-05-31 20:11:01 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 12:45:38 +0100 |
commit | 800ae855f1f25c152cdd9d18a8e632f3e56a316f (patch) | |
tree | 6a7f0a3656da9c336e6d9f429c2222819d7c81b8 /dgit | |
parent | c9868ad90e7b3382b1e7ce4a2fca9cafd398c9db (diff) |
dgit: Write down quilt mode split brain plans in a comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 23 |
1 files changed, 23 insertions, 0 deletions
@@ -178,6 +178,29 @@ our $supplementary_message = ''; our $split_brain = 0; our $do_split_brain = 0; +# Interactions between quilt mode and split brain +# (currently, split brain only implemented iff +# madformat_wantfixup && quiltmode_splitbrain) +# +# source format sane `3.0 (quilt)' +# madformat_wantfixup() +# +# quilt mode normal quiltmode +# (eg linear) _splitbrain +# +# ------------ ------------------------------------------------ +# +# no split no q cache no q cache forbidden, +# brain PM on master q fixup on master prevented +# !$do_split_brain PM on master +# +# split brain no q cache q fixup cached, to dgit view +# PM in dgit view PM in dgit view +# +# PM = pseudomerge to make ff, due to overwrite (or split view) +# "no q cache" = do not record in cache on build, do not check cache +# `3.0 (quilt)' with --quilt=nocheck is treated as sane format + END { local ($@, $?); return unless forkcheck_mainprocess(); |