Search
Tuesday, 24th of April 2018, 23:47:38 UTC
23:47:42
drmeister
scymtym: Thanks - I'll take a look at it.
23:48:08
drmeister
Where do merge conflicts like this come from? I'm trying to merge 'dev' into 'cst'
23:48:09
drmeister
https://i.imgur.com/QCzKXRr.png
23:48:45
drmeister
The one on the left is 'cst' - which should have been in 'dev' some time in the past.
23:49:17
drmeister
I thought merge conflicts only happen when both branches have changes in a range of source lines.
23:49:59
Bike
the cst branch has other changes to those lines. i think.
23:50:56
drmeister
Ugh - so it's a real conflict.
23:51:05
Bike
https://github.com/clasp-developers/clasp/commit/3be7458765bc201824d56aa2c1f99976852c071a#diff-39773bdc3e441809476e26f4f2f98c0b here.
23:51:12
Bike
the check-types, basically.
23:54:26
drmeister
Should I abort this and perhaps we do this together?
23:54:40
drmeister
Here is a list of the files that still have merge conflicts - to give you a sense of the scale
23:55:42
drmeister
Hmm, there is a bit of a problem - it looks like there are folds and the contents of the folds are being copied.
23:56:09
drmeister
https://i.imgur.com/bwVHYv0.png
23:56:58
drmeister
With each passing day 'cst' and 'dev' become more isolated from each other.
0:00:31
Bike
why does cst even have changes to clos
0:03:11
drmeister
There are some \n to %N changes and then there are some other assorted changes.
0:05:35
drmeister
A lot of the differences make sense and I can pick which one to keep - but some are mysterious.
0:06:06
drmeister
I say we put them up on the big screen and discuss the hard ones.
0:06:32
drmeister
But will I have to go through this again when we do the final merge.
0:06:52
drmeister
Will merging now even help you - I'm not so sure now.
0:08:19
drmeister
I aborted the merge - I only want to do this one more time.
0:10:41
drmeister
I don't want to screw up cst.
0:21:47
Bike
i can try just working on it again and hope it doesn't crash
0:21:57
Bike
or you could cherry pick the commits relating to the enclose unwind business
0:22:30
drmeister
The enclose unwind business was a very small change.
0:26:02
drmeister
I am making those changes by hand. Maybe tomorrow you can show me how to cherry pick without blowing everything up.
0:26:17
Bike
it's just `git cherry-pick commithash`
0:27:13
drmeister
How do you find the commithash for a particular change?
0:28:16
Bike
https://github.com/clasp-developers/clasp/commit/88b07f27bb306ec3a3feb500eb717eb0480cc9e2 probably this one
0:28:49
Kevslinger
I feel so bad every time someone posts in #jupyter
0:28:58
Kevslinger
Months and months of people asking for help, with no responses
0:29:00
Bike
i don't understand that comment
0:29:29
drmeister
#jupyter is a lonely place.
0:29:58
drmeister
Ask Shiho about her Jovian magnetosphere meetings - another lonely place.
0:31:44
drmeister
There - I made the world a slightly better place.
0:41:31
drmeister
I fixed the cc_enclose and cc_makeCell calls -
0:41:36
drmeister
in the cst branch.
0:48:40
cracauer
COMMON-LISP-USER> (print '(hello world))
0:48:51
cracauer
FreeBSD rel11.cons.org 11.1-STABLE FreeBSD 11.1-STABLE
0:49:38
Bike
building it was more of an ordeal than porting? unsurprising
0:53:30
drmeister
So FreeBSD has dtrace - correct?
0:57:19
drmeister
I think the answer is yes.
0:57:21
drmeister
https://aws.amazon.com/marketplace/pp/B01LWSWRED/
0:57:44
drmeister
This suggests we could run FreeBSD on AWS - this would help with debugging on Unix - because we can use dtrace
0:59:08
cracauer
I have FreeBSD on AWS for my web robot stuff.
0:59:43
cracauer
Yes, dtrace and a bunch of other things. And I have FreeBSD on bigger boxes than my Macbook.
4:58:45
beach
Good morning everyone!
4:59:13
beach
::notify Kevslinger Yes, that's the one.
4:59:13
Colleen
beach: Got it. I'll let Kevslinger know as soon as possible.
11:44:14
Shinmera
Okey, we are finally back
11:46:48
Shinmera
Our hoster started enforcing MAC/IP checks without notifying us ahead of time. Previously we were using manually generated MACs for our virtual hosts, but now we have to explicitly request specific MACs per IP to use in the hosts.
11:47:29
frgo
So, some kind of security issue. Thanks for sharing.
Wednesday, 25th of April 2018, 11:47:38 UTC