-
-The only thing that this can't easily do is permit nonlinear (ie,
-merging) history on the `packaging-only' branch, because upstream
-might contain debian/ files too, so it is not possible to distinguish
-a merge of two `packaging-only' branches from the special merge `p'.
-(Indeed I since upstream might copy debian/ from us, I think it is not
-easy to reliably distinguish the two parents of a `p'. In the most
-exciting edge case, upstream might `git merge' a previous instance of
-our interchange view, but I think even then everything still works.)
-
-Sean Whitton writes ("Re: Feedback on 3.0 source format problems"):
-> Does the [breakwater] branch contain debian/ alone?
-
-No, it also contains a complete unmodified copy of the upstream code.
-(Except that if upstream had a debian/ directory, it is completely
-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.
-
-
-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%
- /
- /
- --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 (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% /
- / /
- / /
- --p--A-----B-----------------------C--D
- /
- --#----------------------------------------->
-
-
- II. New upstream (0 + 00 neq #)
-
- --/--B3!--%--/------E*-------------/-->
- / / /
- % 4 4**
- / 3 3
- / 2 2
- / 1 1
- 2* &_ /
- / /| \ /
- 1 0 00 =XBC% /
- / /
- / /
- --p--A-----B--------------------p--C--D
- / /
- --#----------------------- - - / - - ----->
- /
- &'
- /|
- 0 00