X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=FORMAT;h=276051d5d1a046e54288956ac6f5d0dff0ed618a;hp=8e061cfadbfadc50bbfd3694626ebb761388b68b;hb=1a6262c839e4ed26b66cbbeb68910d89be52ac03;hpb=8bbe58f296f2b26fa1457c5ed3337d66810a0fae diff --git a/FORMAT b/FORMAT index 8e061cf..276051d 100644 --- a/FORMAT +++ b/FORMAT @@ -30,10 +30,10 @@ In-tree, there are metadata files in .topbloke deleted exists (but empty) if patch is deleted 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) - exists 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+)