fix a few bugs in THEORY

[topbloke.git] / FORMAT

diff --git a/FORMAT b/FORMAT
index 11b2d6b46af1755a73bec140b6d1e6a9d7540542..276051d5d1a046e54288956ac6f5d0dff0ed618a 100644 (file)
--- a/FORMAT
+++ b/FORMAT
@@ -25,15 +25,15 @@ In-tree, there are metadata files in .topbloke
                        as either:
                                <topbloke patch name>
                                - <ref name including refs/heads/>
-                       exist only in base branch
+                       exists only in base branch
 
        deleted         exists (but empty) if patch is deleted
-                       exist only in tip branch
+                       exists only in tip branch
 
-       topgit-         name of the topgit branch that this was
-                       imported from and which we should merge from
-                       (plus a newline)
-                       exist only in base branch
+#TBD#  topgit-         name of the topgit branch that this was
+#TBD#                  imported from and which we should merge from
+#TBD#                  (plus a newline)
+#TBD#                  exists only in base branch
 
        [^+]*-          another property that applies to this patch;
                        if not known to this version of topbloke then it
@@ -49,7 +49,7 @@ In-tree, there are metadata files in .topbloke
     have names starting with "+":
 
        +included       actual included deps, one per line
-                       format as for deps
+                       format as for deps, only includes topbloke patches
                        exists in tip and base branches
 
        +ends           list of ends E(C,Px+)
@@ -201,4 +201,5 @@ head overlappingness by email address pairs, stops other people
 extending your series
 
 series name in each patch ?  some patches marked as definitely series tip ?
-
+some bases marked as definitively series base ?
+"insert after this patch, rewrite all deps everywhere" option ?