[00:39] Good morning. === Ursinha is now known as Ursinha-afk === oubiwann-away is now known as oubiwann [10:07] is it possible to checkout only a subdirectory of a repository in bzr like it is in svn? [10:07] I tried looking in the documentation and faq but didn't really find an answer [10:10] ptman: you can use a filter, but it is not going to save bandwidth. [10:13] ok, thanks [12:18] Bla - I can never get rebase to do what I want. [12:19] GaryvdM, what are you trying to do ? [12:19] Hi jelmer [12:20] 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] I wan A B C [12:20] I want to lose the merge [12:21] jelmer: lp:~garyvdm/bzr/bzrw [12:21] The merge was just a temporary thing, with I ment to uncommit. [12:23] I wish I could do bzr rewrite -r 5344..5346 --onto 5342 [12:23] GaryvdM: patches welcome :-) [12:24] Ok [12:24] oh, you want rebase to sever the parentage of the start of the range [12:24] yeah, tricky [12:24] well, not tricky, just not exposed in the UI, I guess [12:26] I cant seem to work out what to put into the upstream_location to trick it to do that. [12:28] GaryvdM: you'd want rewrite, not rebase (except that doesn't have --onto yet) [12:29] jelmer: Hmm - I don't have a rewrite command. I installed with apt-get. Busy installing from source. [12:33] jelmer: I've install from source, but I still don't have a rewrite command (using lp:bzr-rewrite) [12:33] http://pastebin.org/420172 [12:33] ah, sorry - I meant replay [12:33] rewrite is a hypothetical command at this point [12:33] Ah - Ok [12:49] jelmer: Thanks - I came right. One can use uncommit -r && revert to simulate --onto. === khmarbaise_ is now known as khmarbaise === verterok_ is now known as verterok [16:36] Hi jam. [16:37] morning GaryvdM [16:38] 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] Please could you add my home ip. [16:46] jam: I'm building a bzrw test. [17:01] GaryvdM: I should mention that I think 2.2rc1 is going to be this week [17:02] Ok - I'm actualy on leave this week. [17:02] So I'm hope fully going to do a bunch of bugfixes for qbzr :-) === Ursinha is now known as Ursinha-lunch === beuno is now known as beuno-lunch === beuno-lunch is now known as beuno [18:38] 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. === Ursinha-lunch is now known as Ursinha [19:43] Hey guys, is there a way to apply a patch generated from a git user to a bzr repo? [19:49] nvm, I figured it out [19:49] 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] jelmer: thanks, It turned out to be something trivial [19:57] i was using -p0 rather than -p1 [19:58] I wish the git-bzr connectors worked a little better [20:05] Is there an official 2.2b4 package for ubuntu 10.04 ? [21:28] bzr should support UTF-8 in checkin messages, right? [21:29] mkanat: Yes. [21:29] I thought so. One of my developers' checkin messages looks like cp1252 instead. [21:29] And he claims that he used the same editor he uses to write localizations, which are in UTF-8. [21:30] 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] (Which could be problematic for doing "bzr commit" on a remote branch when your local terminal has a different encoding.) [21:31] 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] Okay. But in this case the "terminal encoding" will be the server's encoding, not the client's encoding, right? [21:33] Or is it converted on the client? [21:33] it's converted (at least it should be) on the client. [21:33] 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] well, it depends on what bzr thinks the terminal encoding is I think [21:37] 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] it might only be converting if you use -m, not if you use an editor [21:40] Ahh, hmm. [21:40] but I'm speculating at this point.. [21:40] rather, s/speculating/guessing/ [21:41] Yeah, so am I--I'm not the person having the problem. :-) [21:41] But I am going to file a bug and point him at it. [22:02] feel free to subscribe me to that bug, can probably fix it relatively easily. [22:04] mgz: Okay. [22:05] mgz: I don't know your lp name, but here's the bug: https://bugs.launchpad.net/bzr/+bug/610229 [22:05] Launchpad bug 610229 in Bazaar "Commit messages on Windows are interpreted as cp1252 even if they are UTF-8 (affected: 1, heat: 8)" [Undecided,New] [22:05] 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] i.e. Rev = 1700.87.1 tag would be something like mysql-5.1.22-ndb-6.2.9 [23:57] hi, is this the right place for some questions aobut bzr serve? [23:57] samd_, yes, sure