From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 21 Jan 2012 00:55:53 +0000 (+0000)
Subject: FORMAT updates
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=commitdiff_plain;h=6e11e84991fb6d32695f9bcce6bd29f00f704111

FORMAT updates
---

diff --git a/FORMAT b/FORMAT
index e9683bf..258e073 100644
--- a/FORMAT
+++ b/FORMAT
@@ -10,8 +10,12 @@ In-tree, there are metadata files in .topbloke
 	msg		brach "commit message"
 
 	deps		direct dependencies, one per line
+			as either:
+				topbloke branch name
+				/refs/heads/<something>
 
 	included	actual included branches, one per line
+				topbloke branch name
 
 	flags		flags that apply to this branch, one per line
 			 unknown flags starting with [a-z] are ok;
@@ -28,7 +32,19 @@ eg
 NB only exactly that date format is allowed and timezone must be Z.
 
 Branches may be specified as
-	[<email>@[<domain.name>/][<date-spec>/]<nickname-path-spec>
+	[<qualifier>/...]<nickname-path-spec>
+where <qualifier>/ is one of
+	[<email>]@[<domain.name>/
+		Only branches matching the specified email local part
+		or domain name match
+	[<date-spec>/]
+		A prefix of the ISO8601 date spec, stopping
+		just after a numeric component (or at the end)
+	[<approx-date-containing-~>/]
+		Intepreted by date -d after ~s have been replaced by
+		spaces.  When we come to select, take the branch
+		nearest that date rather than the most recent
+
 
 <nickname-path-spec> may be
 	<nickname-path>
@@ -37,12 +53,7 @@ Branches may be specified as
 
 <date-spec> may be
 	<approximate date spec containing at least one ~>
-		means all branches are candidates; when we come
-		to select, take the branch nearest that date rather than
-		the most recent; the date spec is intepreted by date -d
-		after ~s have been replaced by spaces
-	A prefix of the ISO8601 date spec, stopping just after a
-		numeric component (or at the end)
+		means all branches are candidates
 
 So overall, if the current branch is
 	ijackson@chiark.greenend.org.uk/2011-08-20T120320Z/fixes/pudding