Back
[11:18:50] <KGB-linuxcnc> 03Sebastian Kuzminsky 052.7 23e2fc7 06linuxcnc 10debian/changelog Merge remote-tracking branch 'origin/2.6' into 2.7 * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=23e2fc7
[11:24:50] <seb_kuzminsky> hmm, my 'git push' hung at the same time cradek disconnected... coincidence?
[11:26:59] <cradek> I didn't disconnect, did I?
[11:28:39] <seb_kuzminsky> 10:02:52 -!- cradek [~chris@outpost.timeguy.com] has quit [Changing host]
[11:28:42] <seb_kuzminsky> 10:02:52 -!- cradek [~chris@emc/board-of-directors/cradek] has joined #linuxcnc-devel
[11:29:22] <cradek> weird, that's when I nickserv-identified
[11:29:39] <cradek> all I saw was 11:02 -!- mode/#linuxcnc-devel [+v cradek] by ChanServ
[11:29:54] <seb_kuzminsky> i also got this in another terminal:
[11:29:55] <seb_kuzminsky> 0 09:59:07 seb@steel /home/seb/linuxcnc.git> git push origin master
[11:29:56] <seb_kuzminsky> Write failed: Broken pipe
[11:29:56] <seb_kuzminsky> fatal: The remote end hung up unexpectedly
[11:31:29] <cradek> Nov 2 17:09:26 git git-daemon[80062]: fatal: The remote end hung up unexpectedly
[11:32:10] <KGB-linuxcnc> 03Sebastian Kuzminsky 05master 2cfd3db 06linuxcnc 10debian/changelog 10src/emc/usr_intf/stepconf/stepconf.py Merge remote-tracking branch 'origin/2.7' * 14http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=2cfd3db
[11:32:31] <seb_kuzminsky> fucking tcp, how does it work
[11:32:41] <cradek> approximately
[11:33:22] <seb_kuzminsky> it's hilarious/depressing that each end claims the other "hung up unexpectedly"
[11:41:11] ChanServ changed topic of
#linuxcnc-devel to:
http://linuxcnc.org | Latest release: 2.6.4
[11:41:40] <cradek> yay!
[12:27:01] <linuxcnc-build_> build #2616 of 0000.checkin is complete: Failure [4failed fetch branch to local git repo] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/0000.checkin/builds/2616 blamelist: Sebastian Kuzminsky <seb@highlab.com>, Chris Morley <chrisinnanaimo@hotmail.com>
[12:59:59] <seb_kuzminsky> crikey
[13:08:53] <seb_kuzminsky> sweet, OP reports #397 fixed in 2.6.4 :-)
[13:25:17] <pcw_home> Thats great!
[20:04:50] <cradek> * [new tag] bdi4 -> bdi4
[20:04:56] <cradek> sometimes I don't understand git at all
[20:34:49] <cradek> haha, a merge conflict where the problem is just comments differing, and both sides' comments are totally wrong
[20:35:30] <ssi> hah
[20:36:45] <cradek> (I just picked one, of course)
[22:07:26] <seb_kuzminsky> cradek:
http://i.imgur.com/QRRLH1m.jpg
