X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=inline;f=FORMAT;h=42f7fa445b41b9a47a06af2644fea0b61b1403a5;hb=2799df8533bddff6feeee7c1b9d31cc6583e04f9;hp=75896b76ff33b90adf516734b94554f934f816cd;hpb=02482c0d173f8599cecdfbf4a53c84514874b529;p=topbloke.git diff --git a/FORMAT b/FORMAT index 75896b7..42f7fa4 100644 --- a/FORMAT +++ b/FORMAT @@ -25,15 +25,15 @@ In-tree, there are metadata files in .topbloke as either: - - 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 + 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+)