diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-04-05 18:14:24 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | 60b4f46cf0a103089163736e6fbf5b2fd62960aa (patch) | |
| tree | 619e7968f863bb8057810391cd1af9835614f334 /README.git-debrebase | |
| parent | 639956a322235edc152f609e966e2cc56905d40d (diff) | |
git-debrebase: found
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'README.git-debrebase')
| -rw-r--r-- | README.git-debrebase | 72 |
1 files changed, 37 insertions, 35 deletions
diff --git a/README.git-debrebase b/README.git-debrebase index cf00345..fc96cd8 100644 --- a/README.git-debrebase +++ b/README.git-debrebase @@ -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 |