chiark / gitweb /
git-debrebase: README.git-debrebase: diagrams of how to handle imports
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 31 Mar 2017 18:04:13 +0000 (19:04 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
README.git-debrebase

index 6b92faf..cf00345 100644 (file)
@@ -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