[Debian-med-packaging] (More) HELP needed: Git with igv [Was: [SCM] igv branch, pristine-tar, updated. a43a5906ca0ecd3c32ce7c348894705928b16fdb]

[Andreas Tille]

Hi again,

it seems I have severa problems understanding git-imprt-orig.  I tried
another package (gmap):

$ git-import-orig  --upstream-branch=upstream/2011-03-11 --upstream-tag==upstream/2011-03-11 --upstream-version=2011-03-11 ../gmap-gsnap-2011-03-11.tar.gz 
gbp:error: 
Repository does not have branch 'upstream/2011-03-11' 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.

So what is the rationale behind this mysterious hint to use
--upstream-branch if this is obviosely ignored?  Ist this a
bug int git-import-orig or am I just to stupid?

Kind regards

      Andreas.


On Sun, Mar 13, 2011 at 10:06:31AM +0100, Andreas Tille wrote:
> Hi,
> 
> I'm new to git and I was running into trouble when trying to git-import-orig
> a new version tarball.  At first I've got a hint to follow
> 
>   file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT
> 
> which I tried because the upstream source branch did not seemed to be tagged
> properly before.  So I did
> 
>     COMMIT_ID=`git log --pretty=oneline | tail -1 | awk '{ print $1 }'`
>     git branch upstream $COMMIT_ID
> 
> and tried again:
> 
> $ git-import-orig ../tarballs/igv_1.5.56.orig.tar.bz2 
> What is the upstream version? [1.5.56] 
> gbp:error: Repository has uncommitted changes, commit these first: 
> gbp:error: # On branch master
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       src/org/broad/igv/session/Persistable.java~HEAD
> nothing added to commit but untracked files present (use "git add" to track)
> 
> I tried some "git add" and "git commit -a" several times in a row but I
> think I mixed it up somehow.  It would be really great if somebody could
> either fix this archive (and tell me what the needed steps to fix it
> were) or just give some reasonable advise how to import the pristine
> tarball correctly.
> 
> Kind regards and thanks for any help
> 
>       Andreas.
> 
> ----- Forwarded message from Andreas Tille <tille at debian.org> -----
> 
> From: Andreas Tille <tille at debian.org>
> To: debian-med-commit at lists.alioth.debian.org
> Date: Sat, 12 Mar 2011 23:25:25 +0000
> X-Spam_score: -4.2
> Subject: [SCM] igv branch, pristine-tar,
> 	updated. a43a5906ca0ecd3c32ce7c348894705928b16fdb
> 
> The following commit has been merged in the pristine-tar branch:
> commit a43a5906ca0ecd3c32ce7c348894705928b16fdb
> Author: Andreas Tille <tille at debian.org>
> Date:   Sun Mar 13 00:21:46 2011 +0100
> 
>     pristine-tar data for igv_1.5.56.orig.tar.bz2
> 
> diff --git a/igv_1.5.56.orig.tar.bz2.delta b/igv_1.5.56.orig.tar.bz2.delta
> new file mode 100644
> index 0000000..eae2cca
> Binary files /dev/null and b/igv_1.5.56.orig.tar.bz2.delta differ
> diff --git a/igv_1.5.56.orig.tar.bz2.id b/igv_1.5.56.orig.tar.bz2.id
> new file mode 100644
> index 0000000..e0e3ebd
> --- /dev/null
> +++ b/igv_1.5.56.orig.tar.bz2.id
> @@ -0,0 +1 @@
> +2321f628e95797bed4f6d5e3d349510d6292ab06
> 
> -- 
> Integrative Genomics Viewer
> 
> _______________________________________________
> debian-med-commit mailing list
> debian-med-commit at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
> 
> 
> ----- End forwarded message -----
> 
> -- 
> http://fam-tille.de
> 
> _______________________________________________
> Debian-med-packaging mailing list
> Debian-med-packaging at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/debian-med-packaging
> 

-- 
http://fam-tille.de