Unwanted dep removal search - difficulties

[topbloke.git] / DESIGN

diff --git a/DESIGN b/DESIGN
index a5c7ee6039431b35161ff50faa27205b574de27c..83465d90eb8f54d170112d74de6b535458b74ae9 100644 (file)
--- a/DESIGN
+++ b/DESIGN
@@ -22,7 +22,7 @@ Basic update algorithm:
 
        Find the (latest) common ancestor.
 
-       Check for unwanted dependency removals.  
+       Check for unwanted dependency removals.
        An unwanted dependency removal is
           A branch in the desired included deps
           Which exists in the common ancestor's actual included deps
@@ -112,7 +112,7 @@ Basic update algorithm:
 The "best order" for merges is in order of recency of common
 ancestor, most recent first, and if that does not distinguish,
 merging from local branches first.
-     
+
 "Recency" refers to the order from git-rev-list --date-order.
 
 Actual included deps:
@@ -225,7 +225,7 @@ OK so here is a plan:
   Check for merge success in the index and compare to exit status
   from git-merge (which is 1 if the merge failed).
   Adjust the metadata.
-  Print appropriate big fat warnings if we have merge conflicts in our 
+  Print appropriate big fat warnings if we have merge conflicts in our
   metadata.
   Commit, adjusting the parents of the new commit to the original
   parents if we made the merge with special massaged parents.
@@ -259,7 +259,7 @@ Unwanted removal search subgraphs:
 inc  inc..
 /  ???   \
 
-    rm         
+    rm
 inc..  rm..    merge of a removal, search down the rm path
 /  [inc]  \
 
@@ -273,7 +273,35 @@ inc..  rm..
    inc         ??? call it an inclusion, terminate search
 rm..  rm..
 /  ???    \
-  
+
 
   rm   inc       inc          rm       irrelevant
   rm   inc     inc inc..    rm rm..
+
+
+
+                                       proposed                   
+                              /          \                        |
+                            /`---------- \ -----<--------.|
+                            /              |                      |
+                          |               |               |
+               RE-INCLUDE inc             rm REMOVAL      |
+               \          |              /  /             |
+                * REMOVAL rm            /  /              |
+                                  |           inc *               |
+                          rm          /                   |
+                          |          /                    |
+                          rm        /                     |
+                          |        /`--------<-----------.|
+                          inc     /                       |
+                          |      /                        |
+               RE-INCLUDE inc   /                         |
+                       \          |    /                          |
+                * REMOVAL rm  /                           |
+                           |  /                                   |
+                           inc                                    |
+                             \                            |
+                              `------------<-------------.|
+                                                          |
+                                                          |
+                                                         IT