Hi,
is somebody able to reproduce the following:
gbp-clone ssh://git.debian.org/git/debian-med/fastaq.git
cd fastaq
uscan --verbose
... fetches ../fastaq_3.2.0.orig.tar.gz
git import-orig --pristine-tar ../fastaq_3.2.0.orig.tar.gz
What is the upstream version? [3.2.0]
gbp:info: Importing
'/home/andreas/debian-maintain/alioth/debian-med_git/fastaq_3.2.0.orig.tar.gz'
to branch 'upstream'...
gbp:info: Source package is fastaq
gbp:info: Upstream version is 3.2.0
pristine-tar: committed fastaq_3.2.0.orig.tar.gz.delta to branch pristine-tar
gbp:info: Merging to 'master'
gbp:error: Merge failed, please resolve.
After this the repository is messed up with a lot of changed, deleted
and new files, most of the files in debian/* vanished.
I havn't experienced anything similar before.
Any clue?
Kind regards
Andreas.
--
http://fam-tille.de
--
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20150302185726.gc9...@an3as.eu
