Hey Andreas,On Wed, Oct 8, 2014 at 2:25 PM, Andreas Tille <andreas@an3as.eu> wrote:Hi Jorge,
On Wed, Oct 08, 2014 at 02:15:59PM +0100, Jorge Sebastião Soares wrote:
> Hi all,
>
> I've reinitiated work on package Fastaq:
>
> https://github.com/sanger-pathogens/Fastaq
> http://anonscm.debian.org/cgit/debian-med/fastaq.git/
Good. :-)Hehe.
> This package will be a dependency of the future package iva:
>
> https://github.com/sanger-pathogens/iva
>
> Upstream changed substantially and I decided to remove the old structure
> entirely (rm -rf) and replace it with the new structure.
>
> I committed my changes.
>
> Ran
>
> uscan --verbose --force-download
>
> To get my new pristine tar from upstream through the watch file.
>
> When I wanted to
>
> js21@builder:~/deb_alioth/current/fastaq_packaging/fastaq$ git import-orig
> --pristine-tar ../Fastaq_1.5.0.orig.tar.gz
>
> I got:
>
> gbp:error:
> Repository does not have branch 'upstream' for upstream sources. If there
> is none see
> file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT
> on howto create it otherwise use --upstream-branch to specify it.
>
>
> In order to create a new upstream branch I followed the recipe in [1]
>
> This was probably not the best thing to do.
>
> I am now having problems merging upstream with master.
I once was lucky with doing a usual git resolve by copying over the file
from the original tarball do `git add *` and than finalise the commit to
merge the files. If this does not help probably recreating the archive
is the less time consuming way to sort this out.I'd done this already.I'm now getting:
js21@builder:~/deb_alioth/current/fastaq_packaging/fastaq$ ll
total 60
-rw-r--r-- 1 js21 js21 32 Oct 8 14:10 AUTHORS
drwxr-xr-x 3 js21 js21 4096 Oct 8 14:33 debian
drwxr-xr-x 3 js21 js21 4096 Oct 8 14:10 fastaq
-rw-r--r-- 1 js21 js21 35156 Oct 8 14:08 LICENSE
-rw-r--r-- 1 js21 js21 56 Oct 8 14:08 MANIFEST.in
-rw-r--r-- 1 js21 js21 1645 Oct 8 14:08 README.md
drwxr-xr-x 2 js21 js21 4096 Oct 8 14:10 scripts
js21@builder:~/deb_alioth/current/fastaq_packaging/fastaq$ git status
# On branch master
nothing to commit (working directory clean)If I then:
js21@builder:~/deb_alioth/current/fastaq_packaging/fastaq$ git-import-orig ../Fastaq_1.5.0.orig.tar.gz
What is the upstream version? [] 1.5.0
gbp:info: Importing '../Fastaq_1.5.0.orig.tar.gz' to branch 'upstream'...
gbp:info: Source package is Fastaq
gbp:info: Upstream version is 1.5.0
fatal: tag 'upstream/1.5.0' already exists
gbp:error: Couldn't run git tag: git returned 128
gbp:error: Import of ../Fastaq_1.5.0.orig.tar.gz failedFrom what I'm seeing everything is as it should be now.I think...