chiark / gitweb /
git-debrebase(5): copy more stuff from README
[dgit.git] / README.git-debrebase
index 19ddbc0..12e2a65 100644 (file)
@@ -46,77 +46,3 @@ deleted all the patches without applying them.
 
 dgit import handling
 --------------------
-
-Consider a non-dgit NMU followed by a dgit NMU:
-
-
-
-            interchange --/--B3!--%--/----D*-->
-                         /          /
-                        %          4
-                       /          3
-                      /          2
-                     /          1
-                    2*         &_
-                   /          /| \
-                  1          0 00 =XBC%
-                 /
-                /
-                 --@--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 (upstream files only)
-    D'        git-debrebase converted debian/ changes import
-
-    * **      before and after HEAD
-
-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%            /
-                 /                                       /
-                /                                       /
-         --@--A-----B-----------------------C--D
-          /
-       --#----------------------------------------->
-
-
- II. New upstream (0 + 00 neq #)
-
-                        --/--B3!--%--/------D*-------------/-->
-                         /          /                    /
-                        %          4                    4**
-                       /          3                    3
-                      /          2                    2
-                     /          1                    1
-                    2*         &_                   /
-                   /          /| \                 /
-                  1          0 00 =XBC%            /
-                 /                               /
-                /                               /
-         --@--A-----B--------------------@--C--D
-          /                             /
-       --#----------------------- - -  /  - - ----->
-                                      /
-                                     &'
-                                    /|
-                                   0 00