diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-09-03 11:43:59 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-09-03 17:45:38 +0100 |
| commit | ee4ae1fa888a5e3c75177a983c1835d2124909c9 (patch) | |
| tree | 51c1717c6636b665de36ef3d529343c0d1d3e381 /dgit | |
| parent | 73feeec9e48f70e6ff31f41c3580cea6ede3da7a (diff) | |
dgit: commentary: improve a diagram
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -189,20 +189,20 @@ our $do_split_brain; # (currently, split brain only implemented iff # madformat_wantfixup && quiltmode_splitting) # -# 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 +# 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 |