Sean Whitton writes ("Bug#959759: dgit-maint-merge(7): Mention
--allow-unrelated-histories"):
> Is this what you mean:
>
> % dgit clone libopencsd
> % cd libopencsd
> % # add and fetch upstream remote
> % git merge -s ours --allow-unrelated-histories v0.14.0
> % git merge v0.14.1
>
> This is better than my patch. If you could confirm, I can prepare a new
> patch.
Yes.
There are still possible problems: if 0.14.0-whatever.dsc was made out
of some upstream 0.14.0.tar.gz which has extra stuff in it (autotools
output, or whatever) then this approach leaves you with 0.14.0's
autotools output (because it looks to git like you added it!) but
0.14.1's autotools input. So this only works well if the 0.14.0
Debian branch you start with was made from something which looks like
upstream git.
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.
