git-import-orig error

Jaromír Mikeš mira.mikes at
Mon Oct 12 15:53:38 UTC 2009

Hi all,

just trying get new upstream release to git and having this error here:
$ git-import-orig /home/mira/zynjacku_5.2.orig.tar.gz 
Upstream version is 5.2
Importing '/home/mira/zynjacku_5.2.orig.tar.gz' to branch 'upstream'...
Switched to branch 'upstream'
rm ''
rm ''
rm ''
[upstream 220833c] Imported Upstream version 5.2
 8 files changed, 178 insertions(+), 491 deletions(-)
 copy => lv2rack (97%)
 rename => zynjacku (54%)
 rename => zynspect (100%)
 rename => zynworld/ (88%)
 mode change 100755 => 100644
Merging to 'master'
Switched to branch 'master'
Auto-merging zynjacku
Auto-merging zynworld/
CONFLICT (content): merge conflict in zynworld/
Auto-merging configure
CONFLICT (content): Merge conflict in configure
CONFLICT (content): Merge conflict in
Automatic merge failed; fix conflicts and then commit the result.
git returned 1
Couldn't merge from "upstream/5.2"
Traceback (most recent call last):
  File "/usr/bin/git-import-orig", line 408, in <module>
  File "/usr/bin/git-import-orig", line 380, in main
    raise GbpError, """Merge failed, please resolve.""" % version
TypeError: not all arguments converted during string formatting
how to solve such issue ?



More information about the pkg-multimedia-maintainers mailing list