From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 31 Mar 2017 18:04:13 +0000 (+0100)
Subject: README.git-debrebase: diagrams of how to handle imports
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d0985574537c97eca6ef928391bb7e4f51b2e877;p=dgit.git

README.git-debrebase: diagrams of how to handle imports
---

diff --git a/README.git-debrebase b/README.git-debrebase
index dd27d8a1..2e183294 100644
--- a/README.git-debrebase
+++ b/README.git-debrebase
@@ -99,3 +99,83 @@ replaced.)
 For `3.0 (quilt)' the breakwater branch contains roughly what you
 would get if you untarred the origs and the debian.tar.gz, and then
 deleted all the patches without applying them.
+
+
+
+Consider a non-dgit NMU followed by a dgit NMU:
+					       
+		       	       	  
+		       	     	  	       
+            interchange --/--B3!--%--/----E--->
+                         /          /	       
+                        %          4	       
+                       /          3	       
+                      /          2	       
+                     /          1	       
+                    2*         &_	       
+                   /          /| \	       
+                  1          0 00 =XBCD	       
+                 /     	     		       
+                /      	     		       
+       	  --p--A---> breakwater
+	   /           	       
+	--#--------> upstream
+		       	       		       
+		       			       
+ Key:		       			       
+		       			       		    
+    =XBC%     dgit tarball import of .debian.tar.gz containing	  
+              Debian packaging including changes B C and patches 
+	 	       	   		       		    	  
+    0         dgit tarball import of upstream tarball	    	  
+		       	   		       		    	  
+    00        dgit tarball import of supplementary upstream tarball
+		       	   		       		    	  
+    &_        dgit nearly-breakwater import    		    	  
+		       	   	   	       		    	  
+    &'        git-debrebase converted import   		    	  
+		       	   		       		    	  
+    D'        git-debrebase converted debian/ changes import	  
+		       	   	   	       		    	  
+Want to transform this into:	   	       		    	  
+     		       	   	   	       		    	  
+ I. No new upstream version (0 + 00 eq #)          			 
+     		       	   	   	       		    	  
+                        --/--B3!--%--/------D--------------/-->     	  
+                         /          /	                  /       
+                        %          4	                 4        
+                       /          3	                3         
+                      /          2 	               2          
+                     /          1  	              1           
+                    2*         &_  	             /            
+                   /          /| \ 	            /             
+                  1          0 00 =XBC%            /           	 
+                 /     	   	   	          /                    
+                /      	   	       	         /             
+     	  --p--A-----B-----------------------C--D--->     
+     	   /           	       	       	       	     
+     	--#----------------------------------------->
+      	 	      	      	               
+     		      	   		     
+ II. New upstream (0 + 00 neq #)       	  
+		      	   	   	       	 	    	  
+		      	       	  interchange  	 	    	  
+		      	   	   	       	 	    	  
+                        --/--B3!--%--/------E--------------/-->     	  
+                         /          /	                  /       
+                        %          4	                 4        
+                       /          3	                3         
+                      /          2 	               2          
+                     /          1  	              1           
+                    2*         &_  	             /            
+                   /          /| \ 	            /             
+                  1          0 00 =XBC%            /           
+                 /    	   	   	          /                    
+                /     	   	       	         /             
+	  --p--A-----B--------------------p--C--D--->     
+	   /         	      	       	 /	     
+	--#----------------------- - -  /  - - ----->
+      	 		      	       /
+				      &'
+				     /|
+				    0 00