[04:18] <Jordan_U> How do I change a previous commit then rebase all of the following commits on top of that change?
[04:28] <RAOF> Jordan_U: I've never actually tried that, but I'd guess the "bzr-rebase" plugin would be a prerequisite.  Have you checked its documentation?
[04:40] <Jordan_U> RAOF: Yes, that was the first place I looked but the only way I can find to do it is to purposefully introduce a conflict for that commit, which is kind of ugly
[05:12] <lifeless> statik: stalking me ? :)
[08:36] <Peng> vila: ping
[08:42] <Peng> vila: Well... Trying out suppress_warnings on an old dirstate-tags standalone branch, accessing it over http (with CGI hpss enabled) or bzr+http, I still get one deprecation warning server-side. It used to be two, but it should be zero, no?
[08:42] <Peng> vila: (I put suppress_warnings in branch.conf, FYI.)
[08:43] <Peng> vila: No warnings server-side with bzr+ssh, though. :D
[09:38] <vila> Peng: I'm not there :-)
[09:38] <vila> Peng: Nevertheless, warning suppression most certainly need to be set server-side too
[09:39] <Peng> vila: I only set it server-side.
[09:39] <vila> Peng: But file bugs or comment on the existing one (can't remember which handy)
[09:39] <Peng> vila: OK.
[09:39] <Peng> I dunno, I like asking about things on IRC first for some reason. :)
[09:40] <vila> Peng: that's not unreasonable :-)
[09:43] <Peng> vila: The existing bug is bug #497694, FYI. :)
[09:47] <vila> Peng: right, can't remember who filed it though :-D
[09:48]  * vila goes back fixing  the kitchen
[09:51] <ruki> i did : bzr push lp:~userid/project-name/branch-name but i am getting this error:  bzr: ERROR: Not a branch: "/home/user/"
[09:51] <bob2> run it in the branch you want to push
[09:51] <bob2> int in ~/
[09:51] <bob2> er 'not in ~/'
[09:52] <Peng> vila: Well, I filed bug #498739. :)
[09:53] <ruki> bob2: i am sorry but i couldnt understand you!
[10:02] <Peng> ruki: Your home directory is apparently not a branch.
[10:03] <Peng> ruki: cd to the directory of the branch you want to push.
[10:03] <ruki> Peng: ok.
[10:10] <ruki> Peng: have a look at this: http://pastebin.com/d32e9a28a
[10:13] <Peng> Oh crap.
[10:13] <Peng> ruki: Um. Try pushing again.
[10:14] <Peng> That's a really trivial problem, but there isn't a nice button to press to fix it. Pushing again will probably work, though.
[10:16] <Peng> ruki: Hold on a second. What's the exact format of the upstream project?
[10:18] <Peng> ruki: Err, never mind, the error message included enough information. Your local repository is using a form that is not backwards-compatible with the upstream project. Even once you're able to push the branch to Launchpad, nobody will be able to merge it without upgrading their branches.
[10:22] <lifeless> lol
[10:27] <Peng> :(
[11:52] <AnAnt> Hello, how can I change the default push/pull targets ?
[11:52] <AnAnt> branches that is
[11:55] <bob2> --remember
[11:55] <bob2> or hack .bzr/branch/branch.conf
[11:57] <AnAnt> bob2: thanks
[13:08] <_Andrew> Do you always have to make a commit when you merge branches?
[13:21] <_Andrew> nevermind, the documentation answers all
[14:06] <NET||abuse> ooh, ubuntu packaged up bzr 2.0.3 today :)
[14:06] <NET||abuse> what cool fun updates should i expect?
[14:08] <gour> does bzr-git enable one to work with bzr locally and commit to github-based project?
[14:15] <jelmer_> gour: yes
[14:16] <gour> jelmer_: that's great to hear. thanks
[14:20] <ronny> gour: s/commit/pull and push/
[14:21] <gour> ronny: cool. how is pida?
[14:22] <ronny> gour: moving slowly, started to get rid of some weird deps
[14:23] <gour> ronny: you're using hg more than bzr?
[14:26] <ronny> yup
[18:16] <thrope> trying to use bzr-svn -... got the following error bzr: ERROR: subvertpy.SubversionException: ('Svndiff contains a too-large window', 185001)
[18:20] <jelmer_> thrope: you need a newer version of subvertpy
[18:20] <thrope> ah ok... it is a big commit. I'm using macports so i'm not sure how easy it is to upgrade but i'll try to get the newer
[18:20] <thrope> thanks
[18:31] <thrope> jelmer_: great that seemed to work
[18:34] <gour> thrope: i'm trying to dpush my local commit to github but get "bzr: ERROR: The remote server unexpectedly closed the connection". any idea?
[18:34] <gour> jelmer_: ^^^
[18:34] <gour> thrope: excuse me...wrong nick :-(
[18:56] <jelmer_> gour, what url are you pushing to?
[18:56] <gour> jelmer_:
[18:56] <gour> git@github.com:gour/django-mingus.git
[18:57] <jelmer_> gour: you need to use a URL
[18:57] <jelmer_> gour: e.g. git+ssh://git@github.com/gour/django-mingus.git
[18:59] <gour> jelmer_: this was better, but resulted in http://dpaste.com/135863/ i+ve to go afk. bbs
[19:26] <gour> jelmer_: any idea what's wrong?
[20:06] <haruspexed> hi how to export revision number of bazaar into a file with every commit? like into 1st line of css file
[20:06] <gour> jelmer_: now i see that the commit is published on githuh, but still wonder about the crash
[21:17] <lifeless> statik: hi
[22:00] <igc> morning
[22:30] <poolie> hi all
[22:33] <Peng> Good morning. :)
[22:38] <lifeless> poolie: hi poolie
[22:41] <poolie> hi
[22:43] <poolie> lifeless: did you get my pm?
[22:44] <lifeless> ah yes