[00:53:13] --- deason has left [03:52:01] --- jaltman has left: Replaced by new connection [03:52:02] --- jaltman has become available [04:47:01] --- kaj has become available [04:53:54] --- haba has become available [04:55:49] kaduk: Thanks, I will ask the Avis people if they have iPass or how much coins I have to load. [05:00:50] --- Simon Wilkinson has become available [05:03:59] --- kaj has left [06:07:07] --- haba has left [06:07:41] --- haba has become available [06:09:08] --- Simon Wilkinson has left [06:57:39] --- haba has left [07:13:09] --- jaltman has left: Replaced by new connection [07:13:10] --- jaltman has become available [07:24:27] --- haba has become available [07:39:09] --- Russ has become available [07:39:10] --- Russ has left: Disconnected [07:42:30] --- Russ has become available [07:52:21] --- matt has become available [07:53:22] could someone provide some advice about how to use "git rebase --whitespace=fix"; in this case, the scenario is, I have pushed a change to gerrit with bogus ws, and now want to fix that up and push again. [07:54:51] the git i have is old enough that it doesn't have that as an option. i use git show (sha1) |git apply --whitespace=fix; git add (files); git commit -c sha1 (where sha1 is the original) and then repush to the same change number, i should update my git [07:56:25] what actually happens when you do this? [07:57:15] git show appears to emit a diff of the changeset [07:57:59] git apply --whitespace=fix ... changes but has not committed? [07:58:35] in the git add step, are you adding new, unrelated files, or... [07:58:47] the tree you git applied to should not have had the original sha1 checked out into it. basically, you're doing the equivalent (in this workflow) of a cherry-pick [07:58:55] that happens to white out the bogus whitespace [07:59:04] ah, ok. so two repos [07:59:13] um. no? [07:59:22] or, two branches [07:59:30] not necessarily [07:59:58] but the original change had not been applied, so it has to be on another branch or, upstream? [08:00:20] you can check out an earlier point in your branch explcitly by sha1 [08:00:31] ok, sure, I should have said checkou [08:00:33] t [08:00:37] the sha1 you want to apply is still in the [08:00:38] ok [08:00:57] i admit my way kind of sucks. but i understand how it works [08:01:24] ok. i need to put together an info sheet for the concierge with bus info, so i will be only semi-payingattention [08:01:26] no, exactly, that's kind of how I'm working myself [08:01:30] (thanks for the help) [08:03:33] also, I plan to use that ws fixup to clean up xcb, add windows, and repush. this is not intended to say anything about whether another repo is used later, I just want to park changesets in public. is that ok? [08:37:31] --- Russ has left: Disconnected [08:57:03] --- haba has left [09:11:08] --- jaltman has left: Replaced by new connection [09:11:09] --- jaltman has become available [09:17:00] --- jaltman has left: Disconnected [10:04:18] --- matt has left [10:18:53] --- Simon Wilkinson has become available [10:20:02] git rebase --whitespace=fix just needs a point to start rebasing/fixing from. [10:20:15] It will take any commit-ish. [10:20:43] If you're wanting to also move your branch to the latest code, then git rebase --whitespace=fix origin/master will do that, and fix the whitespace in the process. [10:22:22] If you _just_ want to fix one or more patches, then use a relative commitish from HEAD. [10:22:45] For example, git rebase --whitespace=fix HEAD^ will just fix whitespace in the patch that's first in your commit history. [10:24:10] --- mmeffie has left [10:24:40] --- mmeffie has become available [10:33:31] --- deason has become available [11:00:02] --- jaltman has become available [11:13:18] --- Simon Wilkinson has left [11:19:34] --- jaltman has left: Disconnected [12:24:33] --- haba has become available [12:41:36] * haba packs stuff into the bag (tomorrow will be a _long_ travel day) [12:42:52] haba: I'm kind of curious what route you plan to take from ORD to champaign. [12:43:44] kaduk: The one that maps.google.com suggested looks OK [12:48:36] Yeah, that certainly looks reasonable. I'll note that the I-294 --> I-80 --> I-57 transition is a bit weird. (But I don't remember exactly how so.) I think it was that I expected the lanes that go I-294 --> I-80 to be on the right, but they were on the left. Anyway, there should be copious signage posted several kilometers in advance, so if you pay attention to those, you should be fine. [12:50:21] My normal route involves I-55 to Illinois Highway 47 to I-74, but I am not entirely sure that I would recommend that to you. (I like it because it has more of a "rural road" feel to it than "big highway".) [12:51:20] I think I drove that once in the 1990s and that was without google maps ;-). The signing in US is good, however as from Europe, one has to get used to the US way of posting things with "3/4 miles" in advance signs. [12:53:17] After a 9h flight I will be fine with boring highway [12:53:37] Fair enough :) [12:55:28] *winks* and hopefully I'll see everyone at the conference tomorrow evening. [12:55:49] --- haba has left [13:25:09] openafs-devel is a good place for people to complain about build failures, right? [15:40:14] or here [15:41:33] One of the GSOC students is emailing me unicast and I would kind of like to cure that habit. [15:42:15] Actually, not a GSOC student. [19:30:56] --- Russ has become available [19:35:24] --- Russ has left: Replaced by new connection [19:35:24] --- Russ has become available [19:43:10] --- shadow has become available [20:03:33] --- jaltman has become available [20:09:03] * Russ thinks he may just walk tomorrow morning. [20:09:12] Looks like kind of a nice walk. [20:09:19] And you never have to leave the UIUC campus. [20:15:28] if you walk early it won't be hot. I'm going to bike [20:15:59] Ah, yeah, there is the heat. But I'm also relatively used to walking in the heat. [20:16:08] * Russ should give it a try around 8am or a bit earlier. [20:16:09] fwiw workshop folks, you should have gotten email with a jabber muc for the workshop [20:24:07] Where do they have you sleeping? [20:29:57] At the iHotel here. [20:30:02] mix? [20:36:18] Ah, the one in the student union? [20:36:34] Yeah, that would be a nice walk. Possibly even on a hot day. [20:39:53] ihotel is way south of student union [20:40:14] It's just south of Assembly Hall. [20:40:53] ... oh. [20:41:21] Yeah, pre-0800h sounds like a good plan, then. [20:41:56] It's only 2 miles, so about a half-hour walk, maybe a bit less. [20:42:26] I'll at least see how the sidewalks are. :) [20:43:00] There should be at least one decent route. I don't think that all choices have (decent) sidewalks, though. [20:43:44] * Russ is currently planning on experimenting with 1st to Amory to Wight. [20:44:10] I could try 4th instead of 1st. [20:45:16] --- Kevin Sumner has left [20:47:07] I think I might go for 4th. But it's been a while since I was a student there, and I didn't really get to that part of campus very often. [20:54:18] google streetview should be able to show you sidewalks. honestly, i forgot to look but istr there's a multiuse path along 1st [21:00:21] There doesn't appear to be any streetview for this path for some reason. [21:02:33] sadly i think the instruction sheet i gave the ihotel desk just suggests first to springfield which would be fine if i'd remembered to look at sidewalks [21:03:11] It does and that might be fine -- I'd just rather stay entirely on campus. [21:30:23] --- Born Fool has become available [21:32:22] --- Russ has left: Disconnected [21:50:00] --- Born Fool has left [21:53:07] --- deason has left [22:00:51] --- reuteras has become available [23:53:39] --- kaj has become available