Ian Jackson writes ("Re: Bug#903132: -fdiverged when `git debrebase
convert-from-gbp` after `dgit push --gbp`"):
> I'm not entirely sure about this system of interlocking snags, where
> the behaviour varies depending on which set of them you chose to
> force.
On reflection I think this is probably not so bad. Already we have
new-upstream which makes somewhat different synthetic merges,
depending on whether some of its checks (snags) were overridden.
> Also what should it do if the user just specifies --force ? I guess
> not make the pseudomerge and expect the user to do some suitable
> git merge -s ours
> later.
So, that. The result will be:
All is well: automatic pseudomerge of archive/debian/something
Things aren't quite right: Snags reported: reasons why things aren't
right, and `diverged'. Without -f or --force, failure (HEAD left
unchanged).
-f used for "Reasons why things aren't right": pseudomerge
made anyway, `diverged' not reported any more.
-fdiverged used, or --force: no pseudomerge made.
Ian.
--
Ian Jackson <[email protected]> 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.
