On 8/19/15, Sebastien Badia <s...@sebian.fr> wrote: > If someone have an idea, I've an issue with ruby-aruba, I'm trying to import > the > 0.8.1 version (in order to close 794157), but I'have a strange merge issue… > (using a pretty standard way) > > $ uscan > $ gbp import-orig ../ruby-aruba_0.9.0.orig.tar.gz --pristine-tar
I have no problems, maybe you repository has changes you forgot about: gbp import-orig ../ruby-aruba_0.9.0.orig.tar.gz --pristine-tar What is the upstream version? [0.9.0] gbp:info: Importing '../ruby-aruba_0.9.0.orig.tar.gz' to branch 'upstream'... gbp:info: Source package is ruby-aruba gbp:info: Upstream version is 0.9.0 pristine-tar: committed ruby-aruba_0.9.0.orig.tar.gz.delta to branch pristine-tar gbp:info: Merging to 'master' gbp:info: Successfully imported version 0.9.0 of ../ruby-aruba_0.9.0.orig.tar.gz