Reading dgit-maint-gbp(7), I see this:
INCORPORATING NMUS
% dgit --gbp pull
Will this actually work ? I think it will apply the changes from the
NMU both to debian/patches/ and to the actual files. This will risk
conflicts in the upstream files (if previous patches touch the same
files) and generate a partially-applied git branch.
It will also create a patch for .gitignore changes, which is probably
not desirable.
Maybe it is a bug that dgit --gbp pull doesn't DTRT. It could do some
kind of clever thing where it spots that we're in split brain mode and
merges only changes to debian/patches.
But I think making this work in the general case (with all --quilt=
options etc.) is beyond the scope of what I have time for in the next
few days.
Do you think that in the meantime I should make `dgit pull' bomb out
in split brain quilt modes ?
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.
