diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 21:18:14 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:59 +0100 |
| commit | 1152570de57130d5b32e8edfa10af1bbc892f2a0 (patch) | |
| tree | c65bf7fdfba55ebc48cebec6f0b2c55e51c13e73 /README.git-debrebase | |
| parent | 47e5e2edc83917f5e21e00586a0907c1f641f174 (diff) | |
git-debrebase(5): copy more stuff from README
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'README.git-debrebase')
| -rw-r--r-- | README.git-debrebase | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/README.git-debrebase b/README.git-debrebase index 19ddbc0..12e2a65 100644 --- a/README.git-debrebase +++ b/README.git-debrebase @@ -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 |