remove old "calculate included patches in topgit branches" idea; we are going to...

[topbloke.git] / DESIGN

diff --git a/DESIGN b/DESIGN
index 97f06810fe75996cfdfb35d656934e591a376465..44650578a3d5473243481e8022e6ce395453f25e 100644 (file)
--- a/DESIGN
+++ b/DESIGN
@@ -115,27 +115,6 @@ merging from local branches first.
 
 "Recency" refers to the order from git-rev-list --date-order.
 
-Actual included deps:
-
-  This is tracked explicitly in .topbloke/included, one branch per
-  line.  For compatibility with older versions, every time we think
-  about a base, branch or source above, we check whether
-  .topbloke/included is present.
-
-  If it isn't then we calculate a child commit which has a
-  .topbloke/included.  In the case of a remote branch or base, we
-  substitute this child commit for the relevant remote ref but do
-  not record it in the remote ref; in the case of a local branch or
-  base, we advance the local branch or base accordingly.
-
-  When .topbloke/included is calculated in this way, it always gets
-  the list of desired included deps.  (topgit,
-  which does not support dependency deletion, always has exactly the
-  desired deps actually included.)
-
-  Foreign branches cannot be removed from included and cannot
-  therefore be removed from dependency lists.
-
 
 Patch removal: