import-orig failed

[Jaromír Mikeš]

Hi,

while updating hydrogen package import-orig failed ...

$ gbp import-orig --pristine-tar /home/mira/PACKAGING/hydrogen_0.9.7.orig.tar.gz
What is the upstream version? [0.9.7]
gbp:info: Importing '/home/mira/PACKAGING/hydrogen_0.9.7.orig.tar.gz'
to branch 'upstream'...
gbp:info: Source package is hydrogen
gbp:info: Upstream version is 0.9.7
gbp:info: Merging to 'master'
gbp:error: Automatic merge failed.
gbp:error: Error detected, Will roll back changes.
gbp:info: Rolling back branch upstream by resetting it to
e8f62f6e8adb352052f31a095083b53636915a29
gbp:info: Rolling back branch pristine-tar by resetting it to
68c4270b4454103e704a14445e53901cd69cab48
gbp:info: Rolling back tag upstream/0.9.7 by deleting it
gbp:info: Rolling back branch master by resetting it to
04a67b78303a484388d130485693cb277183b231
gbp:info: Rolling back failed merge of upstream/0.9.7
gbp:error: Rolled back changes after import error.

Any help?

regards

mira