| --- Log opened Fri Nov 06 00:00:41 2015 |
| 00:09 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has joined #code |
| 00:27 | | catalyst [catalyst@Nightstar-bt5k4h.81.in-addr.arpa] has quit [[NS] Quit: ] |
| 00:27 | | catadroid [catalyst@Nightstar-9nnm31.dab.02.net] has joined #code |
| 00:32 | < gnolam> | https://twitter.com/SwiftOnSecurity/status/662152362346156032 |
| 00:56 | | ion_ [Owner@Nightstar-gmbj85.vs.shawcable.net] has joined #code |
| 00:58 | | ion [Owner@Nightstar-gmbj85.vs.shawcable.net] has quit [Ping timeout: 121 seconds] |
| 01:41 | | Derakon[AFK] is now known as Derakon |
| 02:43 | | catadroid [catalyst@Nightstar-9nnm31.dab.02.net] has quit [A TLS packet with unexpected length was received.] |
| 02:43 | | catadroid [catalyst@Nightstar-9nnm31.dab.02.net] has joined #code |
| 03:03 | | Crossfire [Z@Nightstar-r9lk5l.cust.comxnet.dk] has joined #code |
| 03:04 | | VirusJTG [VirusJTG@Nightstar-6i5vf7.sta.comporium.net] has joined #code |
| 03:19 | | catadroid` [catalyst@Nightstar-r1129u.dab.02.net] has joined #code |
| 03:22 | | catadroid [catalyst@Nightstar-9nnm31.dab.02.net] has quit [Ping timeout: 121 seconds] |
| 03:24 | | Vornotron [Vorn@ServerAdministrator.Nightstar.Net] has joined #code |
| 03:27 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has quit [Ping timeout: 121 seconds] |
| 04:01 | | Derakon [chriswei@Nightstar-5mvs4e.ca.comcast.net] has quit [[NS] Quit: Leaving] |
| 04:07 | | Derakon [chriswei@Nightstar-5mvs4e.ca.comcast.net] has joined #code |
| 05:02 | | * McMartin does the back-and-forth merge technique on git, despite being repeatedly assured that this was some abomination of Subversion that was unnecessary in git's glorious new world |
| 05:05 | | Derakon is now known as Derakon[AFK] |
| 05:13 | | ion_ [Owner@Nightstar-gmbj85.vs.shawcable.net] has quit [Ping timeout: 121 seconds] |
| 05:19 | | macdjord|wurk is now known as macdjord |
| 05:36 | | Vornotron is now known as Vornicus |
| 06:21 | | macdjord [macdjord@Nightstar-r9vt2h.mc.videotron.ca] has quit [Connection closed] |
| 06:22 | | macdjord [macdjord@Nightstar-r9vt2h.mc.videotron.ca] has joined #code |
| 06:22 | < celticminstrel> | Ooh? What's the back-and-forth merge technique? |
| 06:24 | < McMartin> | Merge master into branch, resolve conflicts, merge result back to master. |
| 06:25 | | * McMartin has spent the week doing some seriously aggressive refactoring, and he's not the only one working on this codebase. |
| 06:25 | < celticminstrel> | Oh, um... isn't that exactly what git recommends if you try to push to a branch which has diverged? |
| 06:26 | < celticminstrel> | "Use git pull to merge the remote changes before pushing" or something like that. |
| 06:26 | < McMartin> | No, this is two branches within a repository |
| 06:26 | < McMartin> | So pull/push aren't used at all. |
| 06:26 | < celticminstrel> | It's still the same principle though. |
| 06:26 | < celticminstrel> | Isn't it? |
| 06:26 | < McMartin> | I... don't think so? |
| 06:27 | < McMartin> | In one you're trying to push changes while you and the target disagree as to what HEAD is. |
| 06:27 | < celticminstrel> | Hmm. |
| 06:28 | < celticminstrel> | Maybe I'm wrong actually. Though "git pull" has an implicit merge, the subsequent push does not. |
| 06:28 | < McMartin> | Like, if you try to push and you aren't up-to-date with respect to them, AFAIK push will flat-out fail |
| 06:28 | | * celticminstrel nods. |
| 06:29 | < celticminstrel> | So, does something prevent the second merge from being a fast-forward? |
| 06:30 | < McMartin> | No |
| 06:30 | < McMartin> | The alternative here is "merge the branch directly into master and fix it there because not much can go wrong because git is vastly better at merging" |
| 06:31 | | Crossfire [Z@Nightstar-r9lk5l.cust.comxnet.dk] has quit [Ping timeout: 121 seconds] |
| 06:31 | < celticminstrel> | Oh, so could it be that occasionally the direction of the merge significantly affects the difficulty of resolving conflicts? |
| 06:31 | < McMartin> | Yes, exactly that |
| 06:32 | < McMartin> | The fact that this was the case was also one of the traditional reasons Subversion was the worst thing in the history of things, and I am drawing bitter amusement from this. |
| 06:35 | < McMartin> | Though given the way merges are supposed to be based on sets-of-parents, I'm not actually completely sure why that should be. |
| 06:36 | < McMartin> | Beyond, of course, "if the merge went berzerk, at least you didn't just trash master with it" |
| 06:40 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has quit [Connection closed] |
| 06:50 | | macdjord [macdjord@Nightstar-r9vt2h.mc.videotron.ca] has quit [Connection closed] |
| 06:50 | | macdjord [macdjord@Nightstar-r9vt2h.mc.videotron.ca] has joined #code |
| 07:18 | < Azash> | 08:28 < McMartin> Like, if you try to push and you aren't up-to-date with respect to them, AFAIK push will flat-out fail |
| 07:18 | < Azash> | ONly if you're a WUSS and/or forget to use --force |
| 07:18 | < Azash> | >> |
| 07:19 | < Azash> | Also there is one thing that makes back-and-forth much more reasonable that I can think of |
| 07:20 | < Azash> | In a current project we are naming branches after their user stories in JIRA, and user stories have been divvied up into tasks and then sub-tasks |
| 07:22 | < Azash> | So when you have eg. feature branch PROJ-1 and its subtasks PROJ-2, PROJ-3 and PROJ-4, you have a branch from each of those and use PROJ-1 as an intermediary stage between sub-tasks and the development branch. Back-and-forth is very reasonable in our case, for example, because when the sub-task changes are folded back into the hub branch, and divergent changes are merged into the hub branch as well, it forms the single merge resolution point in either direction |
| 07:23 | < Azash> | Oop, that was too loon and probably got cut off |
| 07:25 | | Kindamoody[zZz] is now known as Kindamoody |
| 07:48 | < McMartin> | Ended in "in either direction" |
| 07:48 | < McMartin> | Looked complete |
| 07:50 | < Azash> | Yes, it is complete |
| 07:51 | < Azash> | Maybe I'm just used to IRCNet's ridiculously low (standards-compliant?) message length |
| 07:58 | | Crossfire [Z@Nightstar-r9lk5l.cust.comxnet.dk] has joined #code |
| 08:06 | < McMartin> | irssi will autoline-split |
| 08:23 | | Kindamoody is now known as Kindamoody|afk |
| 09:40 | | catadroid` is now known as catadroid |
| 09:50 | | catadroid` [catalyst@Nightstar-0uprej.dab.02.net] has joined #code |
| 09:53 | | catadroid [catalyst@Nightstar-r1129u.dab.02.net] has quit [Ping timeout: 121 seconds] |
| 09:56 | | catadroid` is now known as catadroid |
| 10:05 | | catadroid is now known as Ghandi |
| 10:43 | | catadroid [catalyst@Nightstar-uiu8f3.dab.02.net] has joined #code |
| 10:43 | | Ghandi [catalyst@Nightstar-0uprej.dab.02.net] has quit [Connection closed] |
| 10:58 | < TheWatcher> | ARGH. DEATH TO LITTLE-ENDIANS! |
| 10:59 | < [R]> | Is that the non-x86 Endian? |
| 10:59 | < Tamber> | x86 is little-endian, iirc |
| 11:00 | < TheWatcher> | Tamber: Correct |
| 11:02 | | * [R] never understood why Little Endian is a thing. The bytes are all backwards :/ |
| 11:04 | < TheWatcher> | Because intel assembly programmers. |
| 11:05 | < TheWatcher> | (little-endian allows you to access a value in memory as different word sizes without changing the address) |
| 11:11 | | Emmy [Emmy@Nightstar-384h6h.static.chello.nl] has joined #code |
| 11:11 | < Emmy> | AAAAH *^%*$@%*() |
| 11:12 | < Emmy> | I'm reading into 'production' code for the first time on the job |
| 11:12 | < Emmy> | and the WTF/min quotient is wayyy to damn high |
| 11:13 | < Crossfire> | Tha thappens. |
| 11:13 | < Emmy> | I fear my constant WTFing is disturbing the coworkers now. |
| 11:15 | < Emmy> | one of them at least i don't feel guilty about, but still. :/ |
| 11:21 | < Emmy> | Hmmmh. I should add #code to my standard channels. |
| 11:23 | < ToxicFrog> | It's a good channel to be in. |
| 11:24 | < ToxicFrog> | Azash: ircnet and nightstar have the same line length (512 bytes, as mandated by the standard -- which in practice means you get 400-something for the actual message), but it looks like your client is smart enough to autosplit. |
| 11:24 | < ToxicFrog> | Emmy: file all the bugs? |
| 11:25 | < TheWatcher> | http://hdwallpaperia.com/wp-content/uploads/2014/12/Bugs6.jpg ~ |
| 11:36 | | Emms [Emmy@Nightstar-384h6h.static.chello.nl] has joined #code |
| 11:37 | | gizmore [kvirc@Nightstar-kg97rt.dip0.t-ipconnect.de] has joined #code |
| 11:39 | | Emmy [Emmy@Nightstar-384h6h.static.chello.nl] has quit [Ping timeout: 121 seconds] |
| 12:05 | | Emms [Emmy@Nightstar-384h6h.static.chello.nl] has quit [Ping timeout: 121 seconds] |
| 12:08 | | Emmy [Emmy@Nightstar-384h6h.static.chello.nl] has joined #code |
| 12:19 | | Emmy [Emmy@Nightstar-384h6h.static.chello.nl] has quit [Ping timeout: 121 seconds] |
| 12:38 | | gizmore [kvirc@Nightstar-kg97rt.dip0.t-ipconnect.de] has quit [Ping timeout: 121 seconds] |
| 12:43 | | catalyst [catalyst@Nightstar-bt5k4h.81.in-addr.arpa] has joined #code |
| 12:51 | | gizmore [kvirc@Nightstar-4m1.mv6.252.213.IP] has joined #code |
| 12:54 | | catadroid [catalyst@Nightstar-uiu8f3.dab.02.net] has quit [[NS] Quit: Bye] |
| 13:10 | | Emmy [M@Nightstar-9p7hb1.direct-adsl.nl] has joined #code |
| 13:38 | < gnolam> | Emmy: welcome. :) |
| 13:39 | < gnolam> | Didn't know you had gotten a coding job. |
| 13:39 | | * Emmy nodnods |
| 13:40 | < Emmy> | 's been a short wile now, like five or six weeks. |
| 13:40 | < Emmy> | just one (half) day a week, but still, it's a start. :) |
| 13:45 | | catadroid [catalyst@Nightstar-0uprej.dab.02.net] has joined #code |
| 13:51 | < ToxicFrog> | Emmy: what sort of code, if I may ask? |
| 13:53 | < Emmy> | VBA, at the moment |
| 14:17 | < ToxicFrog> | eep |
| 14:17 | < Emmy> | Why so eep? |
| 14:27 | < gnolam> | What the hell |
| 14:30 | < gnolam> | Not only did [web service] work /exactly/ the way I assumed it did, but the very first attempt to interface with it worked perfectly. |
| 14:30 | < catalyst> | oo |
| 14:30 | < catalyst> | I wonder what's broken |
| 14:31 | | * TheWatcher gets out the silver pen and starts drawing wards~ |
| 15:54 | < gnolam> | A-ha! |
| 15:55 | < gnolam> | There /was/ a fault! |
| 15:55 | < gnolam> | My client was calculating a checksum correctly. >_> |
| 15:58 | | * gnolam changes an unsigned int to a signed int, getting it in line with the serverside code. |
| 15:58 | < gnolam> | Ah, bug compatibility. |
| 16:20 | | catadroid` [catalyst@Nightstar-ok7.qom.132.82.IP] has joined #code |
| 16:23 | | catadroid [catalyst@Nightstar-0uprej.dab.02.net] has quit [Ping timeout: 121 seconds] |
| 16:48 | | Emmy is now known as Emmy-brb |
| 17:23 | | Emmy-brb is now known as Emmy-Noms |
| 17:35 | | catadroid` [catalyst@Nightstar-ok7.qom.132.82.IP] has quit [[NS] Quit: Bye] |
| 17:55 | | catalyst [catalyst@Nightstar-bt5k4h.81.in-addr.arpa] has quit [[NS] Quit: ] |
| 17:56 | | Emmy-Noms is now known as Emmy |
| 18:22 | | Vash [Vash@Nightstar-uhn82m.ct.comcast.net] has joined #code |
| 19:10 | | Netsplit *.net <-> *.split quits: Vash, Namegduf, Tamber, gnolam, Xon, himi, ToxicFrog, celticminstrel, iospace, gizmore, (+4 more, use /NETSPLIT to show all of them) |
| 19:21 | | Netsplit over, joins: PinkFreud, ToxicFrog |
| 19:22 | | Netsplit over, joins: Tamber, froztbyte, iospace, gnolam, himi, Vash, Syloq, Azash, Namegduf, celticminstrel (+2 more) |
| 19:27 | | Kindamoody|afk is now known as Kindamoody |
| 19:44 | < Azash> | ToxicFrog: Oh, neat |
| 19:49 | < McMartin> | TheWatcher: The Z80 and 65xx series and the pre-68k Motorola chips were also all little-endian |
| 20:48 | | Kindamoody is now known as Kindamoody[zZz] |
| 22:54 | < McMartin> | Blergh |
| 22:54 | < McMartin> | Aesthetics question for the C++ programmers out there; how icky is it to have declaration order matter for correctness, and when you need it, how hard do you document it? |
| 22:54 | < McMartin> | (That is, fields that use earlier-declared fields as part of their own initialization) |
| 22:56 | < [R]> | ? |
| 23:41 | | Emmy is now known as Emmy-zZz |
| 23:55 | | Vornicus [Vorn@ServerAdministrator.Nightstar.Net] has joined #code |
| --- Log closed Sat Nov 07 00:00:57 2015 |