[00:39] <spiv> Good morning.
[10:07] <ptman> is it possible to checkout only a subdirectory of a repository in bzr like it is in svn?
[10:07] <ptman> I tried looking in the documentation and faq but didn't really find an answer
[10:10] <GaryvdM> ptman: you can use a filter, but it is not going to save bandwidth.
[10:13] <ptman> ok, thanks
[12:18] <GaryvdM> Bla - I can never get rebase to do what I want.
[12:19] <jelmer> GaryvdM, what are you trying to do ?
[12:19] <GaryvdM> Hi jelmer
[12:20] <GaryvdM> I commit a revision (call it A) and then merge rev M and then commit B and C. So I have A M B C
[12:20] <GaryvdM> I wan A B C
[12:20] <GaryvdM> I want to lose the merge
[12:21] <GaryvdM> jelmer: lp:~garyvdm/bzr/bzrw
[12:21] <GaryvdM> The merge was just a temporary thing, with I ment to uncommit.
[12:23] <GaryvdM> I wish I could do bzr rewrite -r 5344..5346 --onto 5342
[12:23] <jelmer> GaryvdM: patches welcome :-)
[12:24] <GaryvdM> Ok
[12:24] <maxb> oh, you want rebase to sever the parentage of the start of the range
[12:24] <maxb> yeah, tricky
[12:24] <maxb> well, not tricky, just not exposed in the UI, I guess
[12:26] <GaryvdM> I cant seem to work out  what to put into the upstream_location to trick it to do that.
[12:28] <jelmer> GaryvdM: you'd want rewrite, not rebase (except that doesn't have --onto yet)
[12:29] <GaryvdM> jelmer: Hmm - I don't have a rewrite command. I installed with apt-get. Busy installing from source.
[12:33] <GaryvdM> jelmer: I've install from source, but I still don't have a rewrite command (using lp:bzr-rewrite)
[12:33] <GaryvdM> http://pastebin.org/420172
[12:33] <jelmer> ah, sorry - I meant replay
[12:33] <jelmer> rewrite is a hypothetical command at this point
[12:33] <GaryvdM> Ah - Ok
[12:49] <GaryvdM> jelmer: Thanks - I came right. One can use uncommit -r && revert to simulate --onto.
[16:36] <GaryvdM> Hi jam.
[16:37] <jam> morning GaryvdM
[16:38] <GaryvdM> jam: I would like to connect to the ec2 machine from home. I tried to do a ssh tunnel through work, but I could not get it to work.
[16:38] <GaryvdM> Please could you add my home ip.
[16:46] <GaryvdM> jam: I'm building a bzrw test.
[17:01] <jam> GaryvdM: I should mention that I think 2.2rc1 is going to be this week
[17:02] <GaryvdM> Ok - I'm actualy on leave this week.
[17:02] <GaryvdM> So I'm hope fully going to do a bunch of bugfixes for qbzr :-)
[18:38] <jam> GaryvdM: if you have a break from using the ec2 instance, let me know. I'm using the more expensive instance because I thought we wouldn't keep it running 24x7.
[19:43] <Crshman> Hey guys, is there a way to apply a patch generated from a git user to a bzr repo?
[19:49] <Crshman> nvm, I figured it out
[19:49] <jelmer> Crshman: The plan is to be able to use "bzr pull" or "bzr merge" on git patches, but that change hasn't landed yet
[19:57] <Crshman> jelmer: thanks, It turned out to be something trivial
[19:57] <Crshman> i was using -p0 rather than -p1
[19:58] <Crshman> I wish the git-bzr connectors worked a little better
[20:05] <Crshman> Is there an official 2.2b4 package for ubuntu 10.04 ?
[21:28] <mkanat> bzr should support UTF-8 in checkin messages, right?
[21:29] <jelmer> mkanat: Yes.
[21:29] <mkanat> I thought so. One of my developers' checkin messages looks like cp1252 instead.
[21:29] <mkanat> And he claims that he used the same editor he uses to write localizations, which are in UTF-8.
[21:30] <mkanat> For a smart server, does it do something like use the LANG and try to translate from the console encoding into UTF-8?
[21:30] <mkanat> (Which could be problematic for doing "bzr commit" on a remote branch when your local terminal has a different encoding.)
[21:31] <jelmer> Internally everything is utf8, so the commit command converts from the terminal encoding to utf8 and then passes that on to other functions in bzrlib
[21:32] <mkanat> Okay. But in this case the "terminal encoding" will be the server's encoding, not the client's encoding, right?
[21:33] <mkanat> Or is it converted on the client?
[21:33] <jelmer> it's converted (at least it should be) on the client.
[21:33] <mkanat> Ahh. So if the client is a Windows machine, even if the editor believes it's writing UTF-8, bzr will interpret it as cp1252.
[21:36] <jelmer> well, it depends on what bzr thinks the terminal encoding is I think
[21:37] <mkanat> Sure, but on Windows, if it's using OutputCP, it will almost always be cp1252. I mean, terminals are pretty much never UTF-8 on Windows.
[21:40] <jelmer> it might only be converting if you use -m, not if you use an editor
[21:40] <mkanat> Ahh, hmm.
[21:40] <jelmer> but I'm speculating at this point..
[21:40] <jelmer> rather, s/speculating/guessing/
[21:41] <mkanat> Yeah, so am I--I'm not the person having the problem. :-)
[21:41] <mkanat> But I am going to file a bug and point him at it.
[22:02] <mgz> feel free to subscribe me to that bug, can probably fix it relatively easily.
[22:04] <mkanat> mgz: Okay.
[22:05] <mkanat> mgz: I don't know your lp name, but here's the bug: https://bugs.launchpad.net/bzr/+bug/610229
[22:05] <TodoInTX> this is probably a n00b question but I haven't found the answer in google yet... does anyone know how to relate a specific revision number to the tag that it's under ?
[22:07] <TodoInTX> i.e.  Rev = 1700.87.1  tag would be something like  mysql-5.1.22-ndb-6.2.9
[23:57] <samd_> hi, is this the right place for some questions aobut bzr serve?
[23:57] <jelmer> samd_, yes, sure