Hi, On Tue, Jun 05, 2018 at 12:22:59PM +0200, Julien Muchembled wrote: > $ gbp clone g...@salsa.debian.org:python-team/modules/zc-lockfile.git > gbp:info: Cloning from > 'g...@salsa.debian.org:python-team/modules/zc-lockfile.git' > $ cd zc-lockfile > $ git branch > * debian/master > pristine-tar > upstream > $ gbp pq import > gbp:info: Trying to apply patches at > '8c7a785b55b4b94093dd2b634ebfcb5d4f238371' > gbp:warning: Patch 'no_doc_txt.patch' has no authorship information, using > 'Debian/Ubuntu Zope Team <pkg-zope-develop...@lists.alioth.debian.org>' > gbp:info: 1 patches listed in 'debian/patches/series' imported on > 'patch-queue/debian/master' > $ git log -2 --oneline --graph debian/master @ > * 8e236e0 (HEAD -> patch-queue/debian/master) no_doc_txt > * 8c7a785 (origin/debian/master, origin/HEAD, debian/master) Merge > remote-tracking branch 'origin/svn' > |\ > $ gbp import-orig > https://files.pythonhosted.org/packages/f5/fe/efb94907d8b2b81c3beab1bd628ff67e310d82816b94aa00b52062727ea9/zc.lockfile-1.3.0.tar.gz > What is the upstream version? [1.3.0] > gbp:info: Importing '../zc.lockfile-1.3.0.tar.gz' to branch 'upstream'... > gbp:info: Source package is zc.lockfile > gbp:info: Upstream version is 1.3.0 > gbp:info: Replacing upstream source on 'debian/master' > gbp:info: Successfully imported version 1.3.0 of ../zc.lockfile-1.3.0.tar.gz > $ git log -2 --oneline > b465d76 (HEAD -> patch-queue/debian/master, debian/master) Update upstream > source from tag 'upstream/1.3.0' > 5706e9b (tag: upstream/1.3.0, upstream) New upstream version 1.3.0 > $ > > Commit 8e236e0 is lost and can't be rebased. I expect > patch-queue/debian/master to still point to it.
Does this work as you'd expect it: $ gbp clone g...@salsa.debian.org:python-team/modules/zc-lockfile.git $ gbp pq import $ git co debian/master $ gbp import-orig https://files.pythonhosted.org/packages/f5/fe/efb94907d8b2b81c3beab1bd628ff67e310d82816b94aa00b52062727ea9/zc.lockfile-1.3.0.tar.gz import-orig imports onto the branch you're currently on causing the above commit to be lost. It should import on the debian-branch instead. Cheers, -- Guido
