Package: git-debrebase
Version: 5.2
Severity: normal
If you have been happily maintaining a package in splitbrain mode and
then you decide to `git debrebase convert-from-gbp`, various commands,
such as `git debrebase new-upstream`, will require passing -fdiverged,
and then your first dgit push will require --overwrite.
Either they should not require passing it, or dgit-maint-debrebase(7)
should explain that it will be needed. I'm not yet sure which is right.
Here is what the problem looks like:
spwhitton@iris:~/src/helm>git debrebase convert-from-gbp v2.9.6
gbp:info: Trying to apply patches at
'2719a9065dabd08b7e2f8486d1d7d0b6b43db7e8'
gbp:info: 3 patches listed in 'debian/patches/series' imported on
'patch-queue/gdr-internal'
HEAD is now at 57854290 patch-emacs-helm-sh
spwhitton@iris:~/src/helm>git-debrebase new-upstream 2.9.7
OK, you are ahead of refs/remotes/origin/master
git-debrebase: snag detected (-fdiverged): you have diverged from
refs/remotes/dgit/dgit/sid
git-debrebase: error: git-debrebase: snags: 1 blockers (you could -f<tag>,
or --force)
And to reproduce the failure as I ran into it,
repo: https://salsa.debian.org/emacsen-team/helm
before `convert-from-gbp`:
2719a9065dabd08b7e2f8486d1d7d0b6b43db7e8
--
Sean Whitton
