Ian Jackson writes ("Re: Bug#902534: dgit: needs a better integration story
with patches-unapplied maintainer trees"):
> Control: forcemerge -1 842614
...
I just had a thought, though:
It might be worth seeing what git-debrebase convert-to-gbp does on
some of the the dgit dsc import commits (perhaps the dgit/dgit/sid
ref, or perhaps the dgit import which is the contributing parent to
the pseudomerge, which will probably be a commit representing a
debian/patches/ patch).
The result may be of some use, although "git merge" is going to be
troublesome since I think git won't be able to determine the common
ancestor.
Ian.
