Ian Jackson writes ("Re: Bug#903132: -fdiverged when `git debrebase
convert-from-gbp` after `dgit push --gbp`"):
> Ian Jackson writes ("Re: Bug#903132: -fdiverged when `git debrebase
> convert-from-gbp` after `dgit push --gbp`"):
> > 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.
This all turned out not to be necessary. There are no checks done
before making the pseudomerge which it would be sensible to offer
forcing for. So:
All is well: automatic pseudomerge.
Something is not well enough for that: No pseduomerge (and a message
to stderr saying why). Likely need for -fdiverged.
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.
