Timestamps are in GMT/BST.
| 00:22:00 | | raptor has joined |
| 00:22:00 | | ChanServ sets mode +o |
| 00:22:10 | raptor | good evening! |
| 00:37:26 | | Watusimoto has joined |
| 00:58:54 | raptor | now to try making a DMG with cmake... |
| 01:02:22 | raptor | Here is what the OSX icon pack looks like: http://sam6.25u.com/upload/3snapshot7.png |
| 01:15:21 | raptor | IT WORKS MUAHAHA |
| 01:27:44 | | Watusimoto_ has joined |
| 01:29:51 | raptor | getting sleepy... night! |
| 01:30:17 | | Watusimoto Quit (Ping timeout: 245 seconds) |
| 01:30:18 | | raptor Quit () |
| 01:56:25 | | Platskies Quit (Quit: Platskies) |
| 02:24:34 | | watusimoto has joined |
| 02:24:34 | | ChanServ sets mode +o |
| 02:28:57 | | Flynnn has joined |
| 02:29:03 | | Flynnn Quit (Remote host closed the connection) |
| 02:35:17 | | Flynnn has joined |
| 02:53:50 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 02:54:21 | | Flynnn has joined |
| 03:26:46 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 03:52:09 | | LordDVG has joined |
| 03:55:03 | | LordDVG Quit (Remote host closed the connection) |
| 04:49:05 | | Watusimoto_ Quit (Ping timeout: 264 seconds) |
| 05:34:16 | | LordDVG has joined |
| 06:25:51 | | Platskies has joined |
| 06:38:55 | | Platskies Quit (Read error: Connection reset by peer) |
| 06:43:28 | | Platskies has joined |
| 07:10:47 | | Platskies Quit (Ping timeout: 272 seconds) |
| 07:18:02 | | Platskies has joined |
| 07:26:54 | | LordDVG Quit (Remote host closed the connection) |
| 07:42:56 | | Canseco has joined |
| 07:55:37 | | Canseco Quit (Ping timeout: 240 seconds) |
| 09:50:23 | | Darrel Quit (Ping timeout: 258 seconds) |
| 09:51:06 | | Darrel has joined |
| 10:11:33 | | Platskies Quit (Quit: Platskies) |
| 10:59:03 | | Watusimoto_ has joined |
| 11:05:10 | | raptor has joined |
| 11:05:10 | | ChanServ sets mode +o |
| 11:12:47 | | Watusimoto_ Quit (Ping timeout: 245 seconds) |
| 11:24:13 | raptor | good day! |
| 11:30:04 | | YoshiSmb has joined |
| 11:30:18 | YoshiSmb | Hi guys |
| 11:51:49 | | Watusimoto_ has joined |
| 12:06:14 | | YoshiSmb Quit (Quit: Saliendo) |
| 12:07:53 | | Watusimoto_ Quit (Ping timeout: 265 seconds) |
| 12:22:45 | raptor | Hi |
| 13:13:23 | | Nothing_Much has joined |
| 13:45:34 | watusimoto | wo is me |
| 13:45:39 | watusimoto | woe is me |
| 13:45:45 | watusimoto | I tried to merge last night |
| 13:46:03 | watusimoto | there is a huge huge mess |
| 13:47:00 | watusimoto | I've done all the obvious stuff, and some of the less-obvious-but-not-too-hard stuff... but I still have 15-20 files of not obvious and dozens to hundreds of changes per file that need to be sorted out |
| 13:55:41 | raptor | Wo! Wo is you! |
| 13:56:10 | raptor | I'm sorry about the merge |
| 13:56:26 | raptor | I thought I had done a lot of the hard stuff... |
| 13:58:38 | watusimoto | I found changes going back to July (and only because I'd added a comment with that date) |
| 13:58:41 | watusimoto | so it's big |
| 13:58:52 | raptor | eek |
| 13:59:10 | watusimoto | I probably need to find a better merge tool |
| 13:59:25 | raptor | kdiff3! |
| 13:59:32 | raptor | i think it works for windows, too.. |
| 13:59:40 | watusimoto | the one I'm using is usually great, but I need to be able to mark individual changes as "not going to change this, stop showing it to me again" |
| 14:00:18 | watusimoto | because many of the changes are mine, and I don't want to revert those obviously... but I don't want to be overwhelemed with seeing those changes once I've marked them as "ok" |
| 14:02:56 | raptor | wait wait |
| 14:03:19 | raptor | does your merge tool trigger when you do the hg merge? |
| 14:04:14 | raptor | i have mine set-up to do that... and it'll open a file and let me 'go to next conflict' |
| 14:04:32 | raptor | and chose one side or the other or edit |
| 14:06:58 | raptor | this is my hg config to enable it: http://pastie.org/pastes/9728379/text |
| 14:15:09 | watusimoto | yes, it does that of course |
| 14:15:25 | watusimoto | what I see is two panes, left is incoming, right is local |
| 14:15:45 | watusimoto | and I need to make modificiations to the local copy and mark the whole file as resolved |
| 14:15:59 | watusimoto | let's say there are 100 changes that need to be reviewed |
| 14:16:05 | raptor | ah ok - i get 3 with kdiff: base, local, other |
| 14:16:31 | watusimoto | if 75 are changes I made and I want, i.e. I don't want to change my local copy, I take no action |
| 14:16:37 | watusimoto | on those 75 |
| 14:16:51 | watusimoto | the other 25 are changes from the remote that I want to move into my local copy |
| 14:17:10 | watusimoto | when I do that move, the flag that there is a diff at that location goes away |
| 14:17:25 | watusimoto | so, when I am done, I have a file with 75 diffs being reported |
| 14:17:48 | watusimoto | this makes things difficult -- how do I know that those 75 have all been reviewed and I am satisified no action is required? |
| 14:18:15 | watusimoto | I can't modify the remote, and I can't mark the change as reviewed and ignored, so I end up with a bunch of noise |
| 14:18:35 | raptor | blah |
| 14:18:41 | watusimoto | what I would do if I could would be to go through those 18 files and get rid of all the changes that I know I made so I don't see them anymore |
| 14:18:44 | raptor | kdiff3 doesn't drop any markers |
| 14:18:59 | watusimoto | then, after a few beers, I would go back and review what's left and try to sort out the remaining mess |
| 14:19:12 | watusimoto | but it would be a lot easier without all the noise of stuff that I don't need to see |
| 14:19:17 | watusimoto | so that is my problem |
| 14:19:18 | raptor | well... if you want, I can do the merge... |
| 14:19:28 | watusimoto | why would you do that? |
| 14:19:38 | | Nothing_Much Quit (Remote host closed the connection) |
| 14:19:42 | watusimoto | it's going to be a nightmare, and the situation is not of your making |
| 14:19:44 | raptor | to be kind? |
| 14:19:47 | watusimoto | ha |
| 14:20:05 | watusimoto | I think the ideal work flow would be this: |
| 14:20:24 | watusimoto | 1) I review all the files, and mark the changes I made and I know we want to keep |
| 14:20:46 | watusimoto | 2) You review the files and do the same (with the lines I marked hidden) |
| 14:20:54 | watusimoto | 3) We deal with what's left |
| 14:21:15 | watusimoto | that way we get down to a small nugget of real problems, probably 5% of what's there now |
| 14:21:21 | watusimoto | maybe this would work: |
| 14:21:36 | watusimoto | I create a copy of the project as you last checked in |
| 14:21:44 | watusimoto | I create a copy of my project |
| 14:22:00 | raptor | ^^ I do that before each major merge |
| 14:22:24 | raptor | i work out of 3 clones |
| 14:22:29 | | Nothing_Much has joined |
| 14:23:53 | watusimoto | I run the differ over those, and just move changes from one to the other, bringing them closer to each other |
| 14:24:01 | watusimoto | then I zip the whole mess up and send it to you |
| 14:24:03 | watusimoto | and you do the same |
| 14:24:08 | raptor | sure |
| 14:24:17 | watusimoto | then send me the results back |
| 14:24:22 | watusimoto | and I make another pass |
| 14:24:27 | watusimoto | and see where we end up |
| 14:24:53 | raptor | another plan of attack - |
| 14:25:01 | raptor | which may be too crazy |
| 14:25:36 | raptor | you go back in time and start another branch that slowly merges in changes up to the point before that last giant merge I did |
| 14:25:50 | raptor | then you merge my merge with much fewer changes in it |
| 14:26:06 | raptor | and continue on up until you get to the end |
| 14:26:23 | raptor | choosing revisions to merge along the way as you see fit |
| 14:26:44 | raptor | in another clone, of course, so you can wipe it all away if something went amiss |
| 14:27:13 | raptor | if that makes sense |
| 14:36:51 | | Nothing_Much Quit (Remote host closed the connection) |
| 14:39:06 | | Nothing_Much has joined |
| 14:40:38 | watusimoto | raptor: that does make sense; I'm not sure how hard it would be |
| 14:40:47 | watusimoto | I don't think there were that many changes |
| 14:40:59 | watusimoto | I tended to work in isolation for many months between checkins |
| 14:41:08 | watusimoto | so my changes were big, but infrequent |
| 14:41:22 | raptor | what i'd do is merge my big merge with a past revision of yours (which will create a new branch) |
| 14:41:32 | raptor | then attempt to merge it back to a newer revision of yours |
| 14:42:31 | watusimoto | I don't know... the changes were pretty sweeping. I'm not sure that would advance us as much as we'd like |
| 14:42:58 | watusimoto | we're really talking about 20 files that have problems (under 20) |
| 14:43:06 | raptor | yeah, it's crazy - but maybe it'll reduce one giant messy merge into 3 or four smaller, messy merges |
| 14:43:16 | raptor | ok |
| 14:43:17 | watusimoto | I can knock off probably half the changes quickly |
| 14:43:23 | raptor | ok |
| 14:43:25 | watusimoto | let me try that tonight and see how things look |
| 14:43:34 | watusimoto | there's lots of stuff like making functions const |
| 14:43:35 | raptor | i recommend working in a different clone... |
| 14:43:37 | watusimoto | that are easy |
| 14:43:47 | watusimoto | yes |
| 14:44:00 | watusimoto | so you would recommend 2 clones? one of my stuff, one of the repo? |
| 14:44:24 | watusimoto | I am in mid-merge at the moment, but I could probably roll back and redo what I did last night on the two new clones |
| 14:44:59 | raptor | what i did: 1 with my changes, 1 at some stable, base revision (like the checked-in big merge) for reference, then 1 that is doing the merge |
| 14:45:21 | raptor | that way you can look at the files as they are at the different revisions |
| 14:46:55 | raptor | and even do diffs between them |
| 14:55:52 | | LordDVG has joined |
| 15:02:42 | watusimoto | I am definitlely going to need more beer |
| 15:06:28 | raptor | and i'll... uhh.. take a harder look at your changes when the time comes :) |
| 15:07:21 | watusimoto | :-) |
| 15:10:56 | | Flynnn has joined |
| 15:42:38 | | Invisible has joined |
| 16:04:09 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 16:08:24 | | Flynnn has joined |
| 17:02:51 | raptor | I just found out that two of my coworkers who just do reporting for management have electrical/mechanical engineering degrees |
| 17:09:29 | | Invisible Quit (Ping timeout: 265 seconds) |
| 17:31:19 | watusimoto | way to use all that edumication |
| 17:32:19 | raptor | i know crazy! I asked them about it - one became a mother; the other said he graduated when Boeing was laying off tons of mechanical engineers |
| 17:33:14 | raptor | so one is doing part time work during her children's older years, and the other just got into a field where he could get a job... |
| 17:33:44 | raptor | i bring this up because I told my team I'm quitting in the near future... |
| 17:33:58 | raptor | and people opened up with past experiences |
| 17:53:26 | watusimoto | you're quitting? |
| 17:53:32 | watusimoto | what's next? |
| 18:06:29 | raptor | school full-time! |
| 18:06:45 | raptor | yeah, i had given my manger my 4-8 months notice back in the summer |
| 18:06:49 | raptor | *manager |
| 18:12:07 | | ChanServ Quit (shutting down) |
| 18:12:52 | raptor | ChanServ come back! |
| 18:15:26 | | ChanServ has joined |
| 18:15:26 | | wolfe.freenode.net sets mode +o |
| 18:20:01 | | LordDVG Quit (Remote host closed the connection) |
| 18:43:13 | watusimoto | so what exactly are you studying? |
| 18:47:26 | | Watusimoto_ has joined |
| 18:59:24 | raptor | ECEN |
| 18:59:30 | raptor | electrical and computer engineering |
| 19:04:46 | | Watusimoto_ Quit (Ping timeout: 264 seconds) |
| 19:05:29 | raptor | heading home! |
| 19:05:31 | | raptor Quit () |
| 19:10:20 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 19:10:21 | | Watusimoto_ has joined |
| 19:21:28 | | Invisible has joined |
| 19:30:17 | | amgine123 has joined |
| 19:30:27 | amgine123 | raptor where is the bug log i need to reprot a bug for 19 d |
| 19:30:33 | amgine123 | thats needs to be fixde |
| 19:37:23 | watusimoto | can you reproduce it? (I know, same old question) |
| 19:38:04 | | Flynnn has joined |
| 19:47:54 | amgine123 | yes! |
| 19:48:11 | amgine123 | try putting a setoprid spwan on a poly wal or barrier teh symbol wont show up |
| 19:48:17 | amgine123 | asteroid |
| 19:48:29 | amgine123 | to warn of it spawning |
| 19:49:37 | amgine123 | let me know when you try it XD |
| 19:51:14 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 19:52:01 | amgine123 | yep aseroid spwans wont warn [;ayers if they are on somthing |
| 19:52:26 | amgine123 | zones loadouts poly walls barriers goals all wont show teh spwan |
| 19:53:16 | amgine123 | !bugs |
| 19:53:16 | BFLogBot | To enter a bug: http://tinyurl.com/bfnewbug -- To view all bugs: http://tinyurl.com/bfbugs |
| 19:59:02 | amgine123 | @ wattsimo |
| 19:59:05 | amgine123 | https://code.google.com/p/bitfighter/issues/detail?id=483&thanks=483&ts=1416358718 |
| 19:59:08 | amgine123 | issue made for it |
| 19:59:13 | amgine123 | very duplicatable |
| 20:02:22 | | Flynnn has joined |
| 20:03:28 | | Flynnn Quit (Client Quit) |
| 20:05:36 | amgine123 | wattsimo are you here ? |
| 20:21:51 | amgine123 | Hes dead jim ! |
| 20:22:04 | amgine123 | nothing much you afk ? |
| 20:22:11 | amgine123 | invisible ? |
| 20:22:18 | amgine123 | lol afkville |
| 20:28:32 | | Flynnn has joined |
| 20:55:42 | watusimoto | thanks for the bug report... will check it out! |
| 20:59:50 | amgine123 | cant belive i missed that in testing! |
| 20:59:56 | amgine123 | *facepalm |
| 21:08:44 | | fordcars has joined |
| 21:30:04 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 21:30:19 | | Flynnn has joined |
| 21:36:46 | | Invisible Quit (Ping timeout: 265 seconds) |
| 21:40:11 | | watusimoto Quit (Quit: Leaving.) |
| 22:12:29 | fordcars | Later! |
| 22:12:31 | | fordcars Quit (Quit: Page closed) |
| 22:46:52 | | Nothing_Much Quit (Remote host closed the connection) |
| 22:47:27 | | Nothing_Much has joined |
| 22:48:24 | | watusimoto has joined |
| 22:48:24 | | ChanServ sets mode +o |
| 23:05:05 | | Flynnn Quit (Quit: This computer has gone to sleep) |
| 23:18:38 | | Flynnn has joined |
| 23:19:29 | | Flynnn Quit (Client Quit) |
| 23:20:56 | | Flynnn has joined |
| 23:21:17 | | Flynnn Quit (Client Quit) |
| 23:36:55 | | raptor has joined |
| 23:36:55 | | ChanServ sets mode +o |
| 23:37:34 | raptor | good evening! |
| 23:53:17 | | Flynnn has joined |
