[Debian-med-packaging] Trouble updating velvet Git repository

[Andreas Tille]

Hi,

I intended to work on velvet Git repository.  I was able to commit some
enhancements regarding new uscan[1] so git-orig-source is using it if
available otherwise it proceeds as usual.  Once I tried to inject the
newly downloaded tarball I get:

$ git import-orig --pristine-tar ../velvet_1.2.10+dfsg.orig.tar.xz
What is the upstream version? [1.2.10+dfsg] 
gbp:info: Importing '../velvet_1.2.10+dfsg.orig.tar.xz' to branch 'upstream'...
gbp:info: Source package is velvet
gbp:info: Upstream version is 1.2.10+dfsg
pristine-tar: committed velvet_1.2.10+dfsg.orig.tar.xz.delta to branch pristine-tar
gbp:info: Merging to 'master'
gbp:error: Merge failed, please resolve.


Uhmmm ...


Seems the repository is spoiled now:

(master) $ git branch
* master
  pristine-tar
  upstream
(master) $ git checkout upstream
debian/README.source: needs merge
debian/changelog: needs merge
debian/compat: needs merge
debian/control: needs merge
debian/copyright: needs merge
debian/rules: needs merge
debian/watch: needs merge
error: you need to resolve your current index first
(master) $ git status
# On branch master
# Changes to be committed:
#
#       deleted:    .gitignore
#       modified:   ChangeLog
#       modified:   Columbus_manual.pdf
#       modified:   Manual.pdf
#       deleted:    contrib/MetaVelvet-1.2.01/ISGraph/ISGraph.o
#       deleted:    contrib/MetaVelvet-1.2.01/ISGraph/libISGraph.a
#       modified:   contrib/README.txt
#       new file:   contrib/VelvetOptimiser-2.2.4/CHANGELOG
#       new file:   contrib/VelvetOptimiser-2.2.4/INSTALL
...
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       deleted by them:    debian/README.source
#       deleted by them:    debian/changelog
#       deleted by them:    debian/compat
#       deleted by them:    debian/control
#       deleted by them:    debian/copyright
#       deleted by them:    debian/rules
#       deleted by them:    debian/watch


This does not look good.  Any hint?

Kind regards

       Andreas.



[1] https://wiki.debian.org/UscanEnhancements

-- 
http://fam-tille.de