[22:03] ev: I have a change to the kde keyboard display... I changed it from using svgs to just drawing the keyboard... the drawing makes it look a bit cleaner and also got rid of 60k of svg files... its not really a bugfix...nor is it a new feature... is this something I can commit? [22:04] shtylman: hrm, how well have you tested this? [22:06] quite well... the changes are contained within the Keyboard.py file in kde components [22:06] so I jused used my test program that I normall use for that [22:07] I can push it to my branch if you wish to review? [22:07] shtylman: seems reasonable enough (though keep an eye out for new bugs pertaining to it) [22:07] shtylman: if you'd prefer a review, but I'm not going to require you to do that [22:07] ev: most certainly .. sounds good [22:15] ev: do you know if there is a way in bzr to do the equivalent of "git reset --hard" ? [22:16] I want to apply my patch ontop of latest trunk and not as a merge commit .. to make the history look nicer [22:16] but I don't see a rebase command either ... so yea... [22:16] shtylman: bzr revert? [22:17] ev: well..that put the files back into the right state...but didn't remove the log entires [22:17] basically..I want to delete a bunch of local commits and do a bzr pull again [22:17] to get the latest from lp [22:17] is that possible? [22:18] I'm a bit confused as to what you want to do, but bzr revert does take an -r (revision) argument [22:18] if you don't want to do that as a merge [22:19] use bzr uncommit [22:19] ev: right... and it did revert the files to that revision... but my bzr log still shows revisions I don't want [22:19] k..lemme try bzr uncommit [22:20] note: don't use uncommit on lp:ubiquity (or any pushed branch) [22:20] ev: right..and that makes sense..but this is a local one only...that I want to unmangle a bit [22:20] sure [22:22] ev: uncommit was what I wanted...thanks :) [22:22] sure thing [22:22] bzr rebase is also of interest if you're after cleaning up the history [22:22] maybe I don't have it installed? [22:23] indeed...it is a separate package.. [22:23] I will try it out [22:24] ive gotten so used to git that I forget how to use the other systems properly [22:51] ev: how is the weather down there? [22:52] git scares me [22:52] shtylman: wonderful [22:52] well, relatively [22:52] heh [22:52] you used to live here, correct? [22:53] yep [22:53] not too long ago :) [22:53] anything I should definitely see before I leave? [22:53] coke museum ... its kinda cool [22:53] can at the end you can sample coke from all around the world [22:54] try the "beverly" I think it is... the one from italy... iirc [22:55] will do [22:55] good stuff [22:55] and git is wonderful :) [22:55] once you learn what it can do [22:55] everything else never works the way you want [22:57] yeah, I don't believe you :-P [22:57] at my new job we use mercurial... and I had to beat it into doing things the way I wanted... it still doesn't do everything quite right :) [22:57] one day you will see the light :p [22:57] and get it [22:59] ev: oh.. and you should also check out this food place called "the vortex" ... I think you might like it.. its interesting thats for sure [22:59] there are two locations in the downtown area [22:59] the have good burgers [22:59] just so I don't lead others into danger, what kind of food is it? [22:59] ah, lovely :) [22:59] s/good/great [23:00] definitely noted