Hi Andreas, On 13-01-14 18:14, Andreas Tille wrote: > Hi Lennart, > > On Mon, Jan 13, 2014 at 06:05:53PM +0100, L.C. Karssen wrote: >> Dear Andreas and others, >> >> I just pushed a new upstream release of probabel to git. On my systems >> this builds on Debian testing and unstable. >> Could you please take a look? > > I could, if you > > git import-orig --pristine-tar <new_upstream_orig_tar> > That didn't work, because I had already created a tag upstream/0.4.2 after I untar-ed the orig.tar and removed patches, updated the d/changelog, etc. I removed the tag locally and upstream. Then I tried again with the following result: $ git import-orig --pristine-tar ../probabel-0.4.2.tar.gz What is the upstream version? [0.4.2] gbp:info: Importing '../probabel-0.4.2.tar.gz' to branch 'upstream'... gbp:info: Source package is probabel gbp:info: Upstream version is 0.4.2 pristine-tar: committed probabel_0.4.2.orig.tar.gz.delta to branch pristine-tar gbp:info: Merging to 'master' gbp:error: Merge failed, please resolve. I ran $ git status # On branch master # You have unmerged paths. # (fix conflicts and run "git commit") # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # deleted by us: doc/Makefile.in # deleted by us: src/Makefile.in # no changes added to commit (use "git add" and/or "git commit -a") and ran 'git rm' on the two files. 'git push' told me I was up-to-date, so I guess it's all ok now. Or not :-)? Thanks, Lennart. > and > > git push > > :-) > > Kind regards > > Andreas. > > -- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* L.C. Karssen Utrecht The Netherlands lennart@karssen.org http://blog.karssen.org GPG key ID: A88F554A -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
Attachment:
signature.asc
Description: OpenPGP digital signature