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

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:
 
 
 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
 
  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
  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
  [^+]*-                ??      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

diff --git a/FORMAT b/FORMAT
index 7313ab8b2ea228857972ce978e2f5a17d43905f4..593fede09b3d1822268c4b71970189e3c9002f8c 100644 (file)
--- a/FORMAT
+++ b/FORMAT
@@ -16,9 +16,8 @@ In-tree, there are metadata files in .topbloke
        deps            direct dependencies, one per line
                        as either:
                                <topbloke patch name>
        deps            direct dependencies, one per line
                        as either:
                                <topbloke patch name>

-                               .f <ref name including refs/heads/>
-                               .tg <ref name not including refs/heads/>
-                       exist only in tip branch
+                               - <ref name including refs/heads/>
+                       exist only in base branch

 
        deleted         exists (but empty) if branch is deleted
                        exist only in tip branch
 
        deleted         exists (but empty) if branch is deleted
                        exist only in tip branch


@@ -29,7 +28,7 @@ In-tree, there are metadata files in .topbloke
        topgit-         name of the topgit branch that this was
                        imported from and which we should merge from
                        (plus a newline)
        topgit-         name of the topgit branch that this was
                        imported from and which we should merge from
                        (plus a newline)

-                       exist only in tip branch
+                       exist only in base branch

 
        [^+]*-          another property that applies to this patch;
                        if not known to this version of topbloke then it
 
        [^+]*-          another property that applies to this patch;
                        if not known to this version of topbloke then it