From 47e14f5f217382a1265241b2ec391306bd6e31d4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 21 Jan 2012 10:03:32 +0000 Subject: [PATCH] topgit -> topbloke --- DESIGN | 12 ++++++------ tg-create.pl => tb-create.pl | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename tg-create.pl => tb-create.pl (100%) diff --git a/DESIGN b/DESIGN index e62456b..23d5a16 100644 --- a/DESIGN +++ b/DESIGN @@ -100,20 +100,20 @@ merging from local branches first. Actual included branches: - This is tracked explicitly in .topgit/included, one branch per + 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 - .topgit/included is present. + .topbloke/included is present. If it isn't then we calculate a child commit which has a - .topgit/included. In the case of a remote branch or base, we + .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 .topgit/included is calculated in this way, it always gets - the list of desired included branches. (Older versions of topgit, - which do not support dependency deletion, always have exactly the + When .topbloke/included is calculated in this way, it always gets + the list of desired included branches. (topgit, + which does not support dependency deletion, always has exactly the desired branches actually included.) Non-topbloke-controlled branches are never recorded in included. diff --git a/tg-create.pl b/tb-create.pl similarity index 100% rename from tg-create.pl rename to tb-create.pl -- 2.30.2