On Thu, 2017-03-09 at 21:13 +1100, Brian May wrote: > Brian May <b...@debian.org> writes: > > > git read-tree --reset -u upstream > > git reset -- debian > > git checkout debian > > git rm debian/.git-dpm > > I have tried these steps on python-mkdocs in the debian/experimental > branch, and then upgraded to the latest upstream (using instructions on > wiki). Works perfectly[1]. > > The only unexpected problem I had is that "gbp import-orig --uscan", by > default, switches to the master branch and attempts to merge the new > upstream there. Which wasn't going to work, because master still is the > patches-applied git-dpm version. I had assumed that it would work on the > current branch; it doesn't.
You can override the target debian / upstream branches with `gbp import-orig --debian-branch=debian/experimental --upstream- branch=upstream/latest`. Long-term you'd want to write your DEP-14 compliant configuration in debian/gbp.conf indeed. Ghis
