diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-03-31 19:04:13 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | 639956a322235edc152f609e966e2cc56905d40d (patch) | |
| tree | 09efe80f733a85a7199ac03606eadb856591858d /README.git-debrebase | |
| parent | 202c8b983924330b7a216299c5e48c2fa8ab024a (diff) | |
git-debrebase: README.git-debrebase: diagrams of how to handle imports
Diffstat (limited to 'README.git-debrebase')
| -rw-r--r-- | README.git-debrebase | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/README.git-debrebase b/README.git-debrebase index 6b92faf..cf00345 100644 --- a/README.git-debrebase +++ b/README.git-debrebase @@ -99,3 +99,83 @@ replaced.) For `3.0 (quilt)' the breakwater branch contains roughly what you would get if you untarred the origs and the debian.tar.gz, and then deleted all the patches without applying them. + + + +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: + + =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 + +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% / + / / + / / + --p--A-----B-----------------------C--D---> + / + --#-----------------------------------------> + + + II. New upstream (0 + 00 neq #) + + interchange + + --/--B3!--%--/------E--------------/--> + / / / + % 4 4 + / 3 3 + / 2 2 + / 1 1 + 2* &_ / + / /| \ / + 1 0 00 =XBC% / + / / + / / + --p--A-----B--------------------p--C--D---> + / / + --#----------------------- - - / - - -----> + / + &' + /| + 0 00 |