From: Ian Jackson Date: Wed, 22 Feb 2012 21:42:22 +0000 (+0000) Subject: remove old "calculate included patches in topgit branches" idea; we are going to... X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=commitdiff_plain;h=c98691988623c62686b36ad0c42d4a958a306a5d;hp=02482c0d173f8599cecdfbf4a53c84514874b529 remove old "calculate included patches in topgit branches" idea; we are going to be incompatible --- diff --git a/DESIGN b/DESIGN index 97f0681..4465057 100644 --- 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: