diff options
| -rw-r--r-- | git-debrebase.5.pod | 84 |
1 files changed, 45 insertions, 39 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 26e4813..af9b91a 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -518,9 +518,14 @@ when git-debrebase rewrites the commit. =head1 APPENDIX - DGIT IMPORT HANDLING +The dgit .dsc import format is not documented or specified +(so some of the following terms are not defined anywhere). +The dgit import format it is defined by the implementation in dgit, +of which git-debrebase has special knowledge. + Consider a non-dgit NMU followed by a dgit NMU: - interchange --/--B3!--%--/----D*--> + interchange --/--B3!--%--//----D*--> / / % 4 / 3 @@ -531,21 +536,22 @@ Consider a non-dgit NMU followed by a dgit NMU: 1 0 00 =XBC% / / - --@--A breakwater - / - --#--------> upstream + --@--A breakwater + / + --#--------> upstream Supplementary key: =XBC% dgit tarball import of .debian.tar.gz containing - Debian packaging including changes B C and quilt patches - + Debian packaging including changes B C and quilt patches 0 dgit tarball import of upstream tarball - 00 dgit tarball import of supplementary upstream tarball - &_ dgit nearly-breakwater import + 00 dgit tarball import of supplementary upstream piece + &_ dgit import nearly-breakwater-anchor + // dgit fetch / import-dsc pseudomerge to make fast forward + &' git-debrebase converted import (upstream files only) - D' git-debrebase converted debian/ changes import + C' git-debrebase converted packaging change import * ** before and after HEAD @@ -556,43 +562,43 @@ We want to transform this into: =item I. No new upstream version (0 + 00 eq #) - --/--B3!--%--/------D*-------------/--> - / / / - % 4 4** - / 3 3 - / 2 2 - / 1 1 - 2 &_ / - / /| \ / + --/--B3!--%--//-----D*-------------/--> + / / / + % 4 4** + / 3 3 + / 2 2 + / 1 1 + 2 &_ / + / /| \ / 1 0 00 =XBC% / - / / - / / - --@--A-----B-----------------------C--D - / - --#-----------------------------------------> + / / + / / + --@--A-----B---------------------C'---D + / + --#-----------------------------------------> =item II. New upstream (0 + 00 neq #) - --/--B3!--%--/------D*-------------/--> - / / / - % 4 4** - / 3 3 - / 2 2 - / 1 1 - 2 &_ / - / /| \ / + --/--B3!--%--//-----D*-------------/--> + / / / + % 4 4** + / 3 3 + / 2 2 + / 1 1 + 2 &_ / + / /| \ / 1 0 00 =XBC% / - / / - / / - --@--A-----B--------------------@--C--D - / / - --#----------------------- - - / - - -----> - / - &' - /| - 0 00 + / / + / / + --@--A-----B-----------------@---C'---D + / / + --#--------------------- - - / - - ---------> + / + &' + /| + 0 00 =back |