FORMAT: put deps etc. in base branch where we need them

[topbloke.git] / DESIGN

diff --git a/DESIGN b/DESIGN
index f3c3f828720c5f47c5a4646463950202ba99b009..0d5215ff78431c0cc0a1b9b69000e6785ece8396 100644 (file)
--- a/DESIGN
+++ b/DESIGN
@@ -231,13 +231,13 @@ OK so here is a plan:
 
 Strategies for each metadata file merge:
 
-       in base/tip     same patch's tip        dep -> base     base -> tip
+       in base/tip     same patch & branch     dep -> base     base -> tip
 
  msg            T      textual merge           rm from src     not in src
- deps           T      list merge              rm from src     not in src
+ deps          B       list merge              rm from src     rm from src
  deleted        T      std existence merge     rm from src     not in src
  patch-                BT      must be same            rm from src     must be same
- topgit-        T      must be same            rm from src     not in src
+ topgit-       B       std exist/text merge    rm from src     rm from src
  [^+]*-                ??      textual merge           rm from src     rm from src
  +included     BT      list merge        rm from non-tb src    list merge
  +*-           ??      textual merge     rm from non-tb src    textual merge