Re: [MoM] New upstream release of ProbABEL
Hi Lennart,
On Mon, Jan 13, 2014 at 06:40:10PM +0100, L.C. Karssen wrote:
> > 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
I think you can ignore the warning about this.
> 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 :-)?
$ git checkout pristine-tar
Gewechselt zu Branch 'pristine-tar'
Ihr Branch ist auf dem selben Stand wie 'origin/pristine-tar'.
probabel(pristine-tar) $ ls
probabel_0.4.1.orig.tar.gz.delta probabel_0.4.1.orig.tar.gz.id
So the pristine-tar files for the new version are not in the repository
- not even in a fresh clone. :-(
Kind regards
Andreas.
--
http://fam-tille.de
Reply to: