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. :-)
> 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.