wip new metadata

[topbloke.git] / FORMAT

diff --git a/FORMAT b/FORMAT
index 75896b76ff33b90adf516734b94554f934f816cd..42f7fa445b41b9a47a06af2644fea0b61b1403a5 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/>
                        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
 
        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)
 
        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
+                       exists 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


@@ -49,7 +49,7 @@ In-tree, there are metadata files in .topbloke
     have names starting with "+":
 
        +included       actual included deps, one per line
     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+)
                        exists in tip and base branches
 
        +ends           list of ends E(C,Px+)