Unwanted dep removal search - difficulties

[topbloke.git] / DESIGN

diff --git a/DESIGN b/DESIGN
index 83465d90eb8f54d170112d74de6b535458b74ae9..1569517b0634542925d0ed6b76b05529099e4761 100644 (file)
--- a/DESIGN
+++ b/DESIGN
@@ -280,28 +280,41 @@ rm..  rm..
 
 
 
-                                       proposed                   
-                              /          \                        |
-                            /`---------- \ -----<--------.|
-                            /              |                      |
-                          |               |               |
-               RE-INCLUDE inc             rm REMOVAL      |
-               \          |              /  /             |
-                * REMOVAL rm            /  /              |
-                                  |           inc *               |
-                          rm          /                   |
-                          |          /                    |
-                          rm        /                     |
-                          |        /`--------<-----------.|
-                          inc     /                       |
-                          |      /                        |
-               RE-INCLUDE inc   /                         |
+                                       proposed                       (elsewhere)
+                              /          \                        |   |
+                            /            \                |   |
+                            /              |                      |   |
+                  REMOVAL rm              |               |   |
+                          |               |               |   |
+                        inc               |               |   |
+                                / |               |               |   |
+                       /  inc             |               |   |
+                      |   | `------------ | ----<-------- | -.|
+                             inc  inc             |               |   *2
+                      |`- | ------------- | ----<--------.|   |
+                      `---inc             |              1*  /
+                          |               |               | /
+               RE-INCLUDE inc             rm REMOVAL      |'
+               \          |              /                |
+                * REMOVAL rm            /                 |
+                                  |           inc                 |
+                          inc         /                   |
+                          |          /                    |
+                          inc       /                     |
+                          |        /`--------<-----------.|
+                          inc     /                       |
+                          |      /                        |
+               RE-INCLUDE inc   /                         |
                        \          |    /                          |
-                * REMOVAL rm  /                           |
+                * REMOVAL rm  /                           |
                            |  /                                   |
                            inc                                    |
-                             \                            |
-                              `------------<-------------.|
-                                                          |
-                                                          |
-                                                         IT
+                             \                            |
+                              `------------<-------------.|
+                                                          |
+                                                          |
+                                                         IT
+
+
+  Merge 1* and 2*, diff against some relevant base branch commit
+  or something, and apply to proposed.