fotis has joined #pypy
fotis has quit [Ping timeout: 265 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 252 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 258 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 265 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 240 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 265 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 272 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 265 seconds]
fotis has joined #pypy
fotis has quit [Ping timeout: 258 seconds]
smarr has quit [Quit: Connection closed for inactivity]
fotis has joined #pypy
greedom has joined #pypy
fotis has quit [Ping timeout: 272 seconds]
fotis has joined #pypy
greedom has quit [Remote host closed the connection]
greedom has joined #pypy
fotis has quit [Ping timeout: 250 seconds]
greedom has quit [Remote host closed the connection]
greedom has joined #pypy
fotis has joined #pypy
greedom has quit [Remote host closed the connection]
greedom has joined #pypy
fotis has quit [Ping timeout: 272 seconds]
greedom has quit [Remote host closed the connection]
Julian has joined #pypy
<
mattip>
Julian: hi
<
cfbolz>
mattip: i'll review isidentical's PR now
<
Julian>
mattip: Hi!
<
Julian>
How are you
<
mattip>
all is good
<
Julian>
Glad to hear.
<
mattip>
hope all is well by you. I opened an issue on one of your repos
<
Julian>
Yeah all good. Oh. Did you, I didn't see it
<
Julian>
My github notifications have gone wild
<
mattip>
(sorry, doing two things at once)
<
Julian>
Ah.. that was quite awhile back, so I'll have to remind myself, but IIRC it did indeed function
<
Julian>
Will lyk in a bit
<
mattip>
cool, I am trying in a test repo now, based on the workflow in "workflow.yml"
<
Julian>
mattip: got a bunch of other things to do but I can have a look at fixing that probably in the next day or two
<
mattip>
ok. thanks
Julian has quit [Quit: leaving]
Julian has joined #pypy
fotis has joined #pypy
fotis has quit [Ping timeout: 252 seconds]
jacob22 has quit [Ping timeout: 240 seconds]
otisolsen70 has joined #pypy
fotis has joined #pypy
fotis has quit [Ping timeout: 250 seconds]
Julian has quit [Quit: leaving]
fotis has joined #pypy
fotis has quit [Ping timeout: 272 seconds]
smarr has joined #pypy
fotis has joined #pypy
Dejan has joined #pypy
Julian has joined #pypy
fotis has quit [Ping timeout: 272 seconds]
stkrdknmibalz has joined #pypy
Julian has quit [Ping timeout: 272 seconds]
jacob22 has joined #pypy
marmoute_ is now known as marmoute
<
ronan>
Apparently we have multiple heads on default??
fotis has joined #pypy
<
cfbolz>
ronan: do we?
<
ronan>
well, it says so when I try to push
<
cfbolz>
they are old
<
cfbolz>
that's really weird
<
ronan>
I did notice something weird on my last pull: "178 local changesets published"
fotis has quit [Ping timeout: 256 seconds]
<
cfbolz>
ronan: so now we need to find out how to fix this :-(
<
ronan>
cfbolz: hmm, hg topics doesn't return anything, I'm quite sure we used to have quite a few
Dejan has quit [Quit: Leaving]
_whitelogger has joined #pypy
<
mattip>
sorry, mess
<
mattip>
heptapod had a wird setting, I tried to get them to revert it, and apparently it published some topic branches that were hanging around
<
mattip>
let me see if I can fix it
<
mattip>
ronan: I think the public repo is OK
<
mattip>
can you push just your changeset with hg push -r xxxx
<
ronan>
mattip: nope, I got a remote traceback
<
mattip>
does it say which commits?
<
ronan>
it says 'ValueError: node 33be2a58845268a4a6e1544bef190ac38d834f24 does not exist'
<
mattip>
that is weird. It is a commit that closed a branch before merging to default
<
ronan>
the commit is there in the web UI, though
<
mattip>
right. Why did you think the problem is with multiple heads on default earlier?
<
mattip>
ronan: try now. I pushed a few older commits and although the ui said "no change" I think it fixed the problem
<
ronan>
mattip: hg push still doesn't work, but hg push -r does
<
mattip>
what branches do you have on hg outgoing?
<
ronan>
I only have one now: hpy-0.0.3
<
ronan>
but hg push complains about multiple heads on branch "default"
<
ronan>
remote: (4 heads: 6a46d28780d8 04a0975fc60f 409924055463 f6e72d5554f1)
<
mattip>
ahh. those must be topic branches on your repo
<
mattip>
so it seems our workflow choices are:
<
mattip>
- use topic branches and not named branches
<
mattip>
- use named branches and not topic branches
<
mattip>
it seems heptapod does not support mixing the two any more
<
mattip>
the problem started because I wanted to let people with developer status push named branches
<
mattip>
to pypy/cffi
<
mattip>
so I must not have understood the implications of everything gracinet was trying to tell me about autopublishing
<
ronan>
mattip: it looks like I don't have any topic branches any more
<
mattip>
so what are those commits?
<
mattip>
6a46d28780d8 04a0975fc60f 409924055463 f6e72d5554f1
<
mattip>
I can't find them in my repo
<
mattip>
I don't see how to search heptapod for commit hashes
<
ronan>
the last one I just pushed
<
ronan>
The other ones look like abandoned MRs
<
mattip>
that was a topic branch
<
ronan>
mattip: unless I'm mistaken, it lost its topic in my repo
<
mattip>
I guess these topic draft branches turned into public branches due to the changes in autopublishing
<
mattip>
so I will merge them to closed-branches
<
mattip>
nope, that doesn't work
<
mattip>
I will try to talk to gracinet tomorrow about making 6a46d28780d8 04a0975fc60f 40992405546 not be heads
<
mattip>
I guess I could merge them to default discarding the changes, but it is too late in the day to do risky stuff
fotis has joined #pypy
fotis has quit [Ping timeout: 272 seconds]
Julian has quit [Quit: leaving]
greedom has quit [Remote host closed the connection]
otisolsen70 has quit [Quit: Leaving]
fotis has joined #pypy
fotis has quit [Ping timeout: 250 seconds]