From 2c7894055e45c927157bd8c3454a78fbe095e123 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 Jan 2012 16:27:48 +0000 Subject: [PATCH] wip more notes --- DESIGN | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/DESIGN b/DESIGN index b1c06eb..f03febb 100644 --- a/DESIGN +++ b/DESIGN @@ -125,8 +125,8 @@ Branch removal: - removed branch wants not to be in list of branches "git-branch" et al any more - branches in refs/top-branches ? - deleted branches do something to the base ? + branches in refs/top-branches ? yes + deleted branches do something to the base ? no deleting empty branch: dependencies fine deleting nonempty branch: if any dependencies found, their @@ -138,6 +138,9 @@ Branch removal: - remove from dependencies of active branches only makes sense if no active branches depend on it. + undeleting + - just unmark the branch as deleted + Branch naming: needs to be globally unique so put email address in it @@ -149,3 +152,21 @@ not permitted (git-check-ref-format(1)) spc ~ ^ : ? * [ \ @{ .lock. (apropos of shell) + + +When pulling, which remotes get to update which branches ? +Complicated question! + +For now, have "blessed" remotes, which we always pull and update from. +All these count as sources above. + +Update operation restrictions available, which restrict use of various +sources above ? What about implications for correctness of merge +algorithm ? + + +Concept of a "stack" ? +Unnecessary - instead, deal with leaf branches +Operations like "go up the stack", goes towards leaf. Hopefully unique. +"Down" the stack, uses a "conventional" linearisation +Stack reordering op ? auto adjust deps -- 2.30.2