I took a look at this.
I think the merging workflow you describe will not go well if the sid
package develops changes to upstream files (through new upstream
version, or through changes to the delta queue). Typically the
package is `3.0 (quilt)', so if there are any changes to the delta
queue, dgit patch linearisation will be needed, and it may well fail
after `git merge'.
Possible solutions may include:
- being the maintainer in sid and knowing what your git workflow
and branch format is and doing something workflow-specific
- git-debcherry (blocked by #930881)
- changing the source format
- git-ffqrebase (does not exist yet, #869993)
- git-debrebase convert-from-dgit-view may help in some cases;
I have used it for security updates with moderate success,
but I think repeated conversions may be troublesome
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
