12:21 a.m.
Oof, someone (not me!) has done a premature merge of "gentest" into
master and I'm afraid the code base is seriously messed up right now.
Hopefully git is smart enough that we can pull out of this before
long. But if gretl won't build right now, you know what's happening.
Allin
12:34 a.m.
On Fri, 3 Feb 2017, Allin Cottrell wrote:
Oof, someone (not me!) has done a premature merge of
"gentest" into master
and I'm afraid the code base is seriously messed up right now.
Hopefully git is smart enough that we can pull out of this before long. But
if gretl won't build right now, you know what's happening.
git reset --hard cdd2fe
fixes my working copy of master, but I haven't yet figured how to
propagate this back to sourceforge (commit/push doesn't work).
Allin
12:38 a.m.
Can't you git push --force ?
On Sat, Feb 4, 2017 at 12:34 AM, Allin Cottrell <cottrell(a)wfu.edu> wrote:
On Fri, 3 Feb 2017, Allin Cottrell wrote:
Oof, someone (not me!) has done a premature merge of "gentest" into master
> and I'm afraid the code base is seriously messed up right now.
>
> Hopefully git is smart enough that we can pull out of this before long.
> But if gretl won't build right now, you know what's happening.
>
git reset --hard cdd2fe
fixes my working copy of master, but I haven't yet figured how to
propagate this back to sourceforge (commit/push doesn't work).
Allin
_______________________________________________
Gretl-devel mailing list
Gretl-devel(a)lists.wfu.edu
http://lists.wfu.edu/mailman/listinfo/gretl-devel
1:58 a.m.
On Sat, 4 Feb 2017, Hélio Guilherme wrote:
Can't you git push --force ?
Thanks, Hélio, but that doesn't work. I've tried
git pull
git reset --hard cdd2fe
git push origin HEAD --force
(and also just plain "git push --force")
but I'm getting the message (with both of the last two commands):
<quote>
remote: error: denying non-fast-forward refs/heads/master (you should
pull first)
To ssh://git.code.sf.net/p/gretl/git
! [remote rejected] master -> master (non-fast-forward)
</quote>
I don't like that "you should pull first", since that's exactly what I
did, and seems to take me into a circle.
Allin
On Sat, Feb 4, 2017 at 12:34 AM, Allin Cottrell
<cottrell(a)wfu.edu> wrote:
> On Fri, 3 Feb 2017, Allin Cottrell wrote:
>
> Oof, someone (not me!) has done a premature merge of "gentest" into master
>> and I'm afraid the code base is seriously messed up right now.
>>
>> Hopefully git is smart enough that we can pull out of this before long.
>> But if gretl won't build right now, you know what's happening.
>
> git reset --hard cdd2fe
>
> fixes my working copy of master, but I haven't yet figured how to
> propagate this back to sourceforge (commit/push doesn't work).
>
> Allin
3:37 a.m.
On Fri, 3 Feb 2017, Allin Cottrell wrote:
On Fri, 3 Feb 2017, Allin Cottrell wrote:
> Oof, someone (not me!) has done a premature merge of "gentest" into master
> and I'm afraid the code base is seriously messed up right now.
>
> Hopefully git is smart enough that we can pull out of this before long. But
> if gretl won't build right now, you know what's happening.
git reset --hard cdd2fe
fixes my working copy of master, but I haven't yet figured how to propagate
this back to sourceforge (commit/push doesn't work).
For future reference (though I hope this isn't needed again!), the
correct procedure seems to be:
1. git pull
2. Issue "git revert" commands for the bad commit IDs, working
backwards in time (e.g. "git revert 85f3d6", ...)
3. git push
So I think we're OK again now.
Allin
1:57 p.m.
Am 04.02.2017 um 04:37 schrieb Allin Cottrell:
> On Fri, 3 Feb 2017, Allin Cottrell wrote:
>
>> Oof, someone (not me!) has done a premature merge of "gentest" into
>> master and I'm afraid the code base is seriously messed up right now.
For future reference (though I hope this isn't needed again!),
So how was this premature action possible? Surely there must be a log of
some sort?
thanks,
sven
5:25 p.m.
On Sat, 4 Feb 2017, Sven Schreiber wrote:
Am 04.02.2017 um 04:37 schrieb Allin Cottrell:
>> On Fri, 3 Feb 2017, Allin Cottrell wrote:
>>
>>> Oof, someone (not me!) has done a premature merge of "gentest"
into
>>> master and I'm afraid the code base is seriously messed up right now.
>
> For future reference (though I hope this isn't needed again!),
So how was this premature action possible? Surely there must be a log of some
sort?
Yes, there's a log. The action was inadvertent and I'm not going to
"name names". But we need to be clear on how to avoid this sort of
thing; I'll try to write up a note on that.
Allin
2923
days inactive
2923
days old
6 comments
3 participants
participants (3)
-
Allin Cottrell -
Hélio Guilherme -
Sven Schreiber