X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=DESIGN;h=1569517b0634542925d0ed6b76b05529099e4761;hp=83465d90eb8f54d170112d74de6b535458b74ae9;hb=ed5261298c2cc3e7488e8b85946cdc9d5fd46794;hpb=6101b61b9a5639758f88a198d1493c0dce0b799f

diff --git a/DESIGN b/DESIGN
index 83465d9..1569517 100644
--- 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.