Rakudo 0.1~2011.07-1 ready for upload

Alessandro Ghedini al3xbio at gmail.com
Sun Aug 7 12:27:39 UTC 2011


On Sun, Aug 07, 2011 at 01:58:26PM +0200, Dominique Dumont wrote:
> Le Thursday 4 August 2011 21:53:52, Alessandro Ghedini a écrit :
> > Dominique, when you have some time, could you please have a look?
> 
> Uploaded (as you have already seen)
> 
> But, being a git newbie, I have some trouble pushing my modifs to alioth:
> 
> $ git push --all
> To git+ssh://git.debian.org/git/pkg-rakudo/pkg-rakudo.git
>  ! [rejected]        pristine-tar -> pristine-tar (non-fast-forward)
>  ! [rejected]        upstream -> upstream (non-fast-forward)
> error: failed to push some refs to 'git+ssh://git.debian.org/git/pkg-
> rakudo/pkg-rakudo.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
> 'Note about fast-forwards' section of 'git push --help' for details.
> 
> 
> I do not known where I messed up. Could you help me out ?

It seems like you have done some changes to the "upstream" and 
"pristine-tar" branches that conflict with the alioth repository... which 
shouldn't be given that the upstream update was done by me. 

I don't know how to solve the problem without having access to your 
local repository, but you should be fine re-cloning the alioth repository
with gbp-clone (the changes you have done to "master" have been already 
published, and I am able to build the package with them).

Cheers

-- 
perl -E'$_=q;$/= @{[@_]};and s;\S+;<inidehG ordnasselA>;eg;say~~reverse'



More information about the Pkg-rakudo-devel mailing list