wip more notes

diff --git a/DESIGN b/DESIGN
index b1c06ebcfc3013c5ac391a027b7d6d1f7f202646..f03febbfa8019d4642e7e47b10939b8d963e74a0 100644 (file)
--- 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