Re: bison-master

[Akim Demaille]

Le 31 mars 2012 à 12:38, Akim Demaille a écrit :

> Le 27 mars 2012 à 15:40, Rob Vermaas a écrit :
> 
>> Hi Akim,
>> 
>> the jobset was disabled for some reason. I have ennabled it again,
>> however the tarball job (make dist) currently fails:
>> http://hydra.nixos.org/build/2338369
> 
> Hi Rob,
> 
> It seems to be disabled again.  Can it be because this branch is
> not monotonic?  git pull has no reason to work properly on it,
> one really needs git fetch && git checkout -f origin/next, because
> there are (basically) git push -f happening on it.

Hi Rob,

Sorry to bug you again, but bison-next is still blocked.  It
reports:

http://hydra.nixos.org/jobset/gnu/bison-next
> Error pulling latest change git repo at `git://git.sv.gnu.org/bison.git':
> Pull is not possible because you have unmerged files.
> Please, fix them up in the work tree, and then use 'git add/rm <file>'
> as appropriate to mark resolution, or use 'git commit -a'.

The "next" branch of Bison is really meant for experimentation,
with plenty of git pull -f, so "git pull --rebase" is not the
right means to update a checkout.  It should rather be something
like:

git fetch && git checkout -f origin/next && git remote update --init

or something like this.

Thanks!