Control: clone -1 -2 Control: retitle -2 convert-from-gbp: `diverged', --overwrite if no previous dgit push Control: tags -2 - pending
My fix for #903132 has arguably made things worse for a different use case: if the user goes straight from (i) gbp without dgit, to (ii) gdr with dgit, then the new pseudomerge generation cannot work. So there will be a new message about that. But also, there will be a new `diverged' snag at the time of git debrebase convert-from-gbp, if the user has ever done dgit fetch sid. In that case the user of gdr 5.8 will have to specify -fdiverged to convert-from-gbp. In both cases they will also have to tell dgit --overwrite, just as they would for 5.7 and earlier. It might be possible to find a suitable parent to overwrite with a pseudomerge, provided the user has done `dgit fetch sid'. The basic recipe would be to check that the last maintainer view tag corresponds to dgit/dgit/sid (except for debian/patches). But this is complicated and fiddly. I suggest that we document this problem, instead. 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.
