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