chiark / gitweb /
git-debrebase: found
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 5 Apr 2017 17:14:24 +0000 (18:14 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
README.git-debrebase
git-debrebase

index cf00345..fc96cd8 100644 (file)
@@ -106,44 +106,46 @@ 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:                                         
-                                                           
+            interchange --/--B3!--%--/----D*-->                    
+                         /          /                      
+                        %          4                       
+                       /          3                        
+                      /          2                         
+                     /          1                          
+                    2*         &_                          
+                   /          /| \                         
+                  1          0 00 =XBC% 
+                 /                                                 
+                /                                                  
+                 --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     
-                                                                 
+                                      
+    * **      before and after HEAD
+                                 
 Want to transform this into:                                     
                                                                  
- I. No new upstream version (0 + 00 eq #)                               
+ I. No new upstream version (0 + 00 eq #)                               
                                                                  
-                        --/--B3!--%--/------D--------------/-->          
+                        --/--B3!--%--/------D*-------------/-->          
                          /          /                    /       
-                        %          4                    4        
+                        %          4                    4**      
                        /          3                    3         
                       /          2                    2          
                      /          1                    1           
@@ -152,18 +154,18 @@ Want to transform this into:
                   1          0 00 =XBC%            /                    
                  /                                       /                    
                 /                                       /             
-         --p--A-----B-----------------------C--D--->     
-          /                                         
-       --#----------------------------------------->
-                                              
-                                            
- II. New upstream (0 + 00 neq #)                 
+         --p--A-----B-----------------------C--D--->       
+          /                                                
+       --#----------------------------------------->       
+                                                           
+                                                           
+ II. New upstream (0 + 00 neq #)                                   
                                                                  
                                  interchange                     
                                                                  
-                        --/--B3!--%--/------E--------------/-->          
+                        --/--B3!--%--/------E*-------------/-->          
                          /          /                    /       
-                        %          4                    4        
+                        %          4                    4**      
                        /          3                    3         
                       /          2                    2          
                      /          1                    1           
index 4cd2203..8c1dba8 100755 (executable)
@@ -286,7 +286,7 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub launder ($$$;$$$) {
+sub walk ($$$;$$$) {
     my ($input, $pseudos_must_overwrite_this, $wantdebonly,
        $report, $depth, $report_anomaly, $nogenerate) = @_;
     # go through commits backwards