=== mwhudson_ is now known as mwhudson
[00:51] <spiv> Gar, gnome-terminal just crashed.
[00:52] <spiv> Hmm, an assertion error from vte in xsession-errors.
[00:55] <mwhudson> ow
[01:50] <chmac> `bzr branch lp:~vcs-imports/wordpress/2.9 wp29`, `cd wp29`, `bzr up` tells me the repository is at 11084, but there are new revisions in launchpad that it's not pulling down.
[01:50] <chmac> I'm guessing I've misunderstood how branching / updating works. Any pointers?
[01:50] <chmac> Hmm, maybe I need to merge...
[01:51] <gutworth>  bzr pull
=== blueyed_ is now known as blueyed
[01:51] <chmac> gutworth: Aha, ok, thanks
[01:54] <spiv> chmac: 'bzr up' is for making a checkout of a branch up-to-date.  You did 'bzr branch', so you simply have a branch, not a checkout.
[01:54] <chmac> spiv: Thanks. I'm starting to wrap my head around those concepts... :-)
[01:54] <spiv> chmac: hence why you need to 'pull'
[03:28] <spiv> Odd, https://code.edge.launchpad.net/~johnf-inodes/bzr/serve-init/+merge/12938 hasn't been automatically marked as merged.
[03:50] <poolie> jam, i guess you're asleep?
[04:08] <poolie> feeding pqm...
[04:11] <spiv> <pqm> nom nom nom
[04:35] <jam> poolie: not asleep yet, just not near the machine
[04:35] <jam> poolie: what's up?
[04:45] <poolie> hi jam
[04:45] <poolie> i was just thinking about your thing of getting changes in more quickly
[04:45] <poolie> because a couple of relevant things came up today
[04:45] <poolie> one being, could we test LockDir.peek
[04:45] <poolie> and the other, should you check for existing users of the module featuers
[04:45] <poolie> features*
[04:46] <poolie> in both cases it would have some value- it's possible the test could fail, today or later
[04:46] <poolie> but it's the kind of thing that tends to change something from being 5m into an hour, or an hour into a day
[04:50] <lifeless> poolie: changing symbol names added the concern about checking for users of the symbols
[04:50] <lifeless> poolie: So its clearly possible to do a 5m thing there :)
[04:50] <poolie> ?
[04:51] <lifeless> 15:45 < poolie> and the other, should you check for existing users of the module featuers
[04:51] <poolie> so one thing could have been to take a smaller step
[04:51] <poolie> of just changing the implementation not the name
[04:54] <lifeless> yes
[11:07] <chx> hi. how cna i do a commit after a merge w the merge tips as commit message?
[11:26] <awilkins> What do you chaps use for requirements tracking? Standard issue tracker?
[11:27] <lifeless> yes
[12:32] <Solipsist> ive attempt to revert local changes using 'bzr revert' but keep getting this error message: bzr: ERROR: The file id "xxxx" is not present in the tree , what does it mean?
[12:34] <spiv> Solipsist: if you're getting that and you aren't passing any arguments to 'bzr revert' then that would be a bug I think.  Which version of bzr?
[12:35] <Solipsist> using v 2.0.3
[12:35] <Solipsist> so i deleted a directory and now i want to restore it from the local repost
[12:36] <Solipsist> being used to git, i tried bzr checkout, but that's a no go so i looked at the commands and tried bzr revert directory/, then just bzr revert
[12:36] <Solipsist> is there a page describing bzr for us used to SVN, and lately GIT?
[12:48] <spiv> Solipsist: 'bzr revert DIR' or just 'bzr revert' in a working tree are supposed to do that.
[12:48] <spiv> Solipsist: so it sounds like you've hit a bug, which is a bit surprising but not impossible.
[12:49] <spiv> Solipsist: so please do file a bug report
[12:51] <Solipsist> ok, but filing a bug won't help me much right now, so what can i do to remedy this?
[12:52] <Solipsist> i have no changes i wish to keep so i could throw away the working tree and restore it from the local repos ive created, the local repos has been updated from the remote with bzr pull
[12:57] <Solipsist> i guess this whole bazaar concept of a branch confuses me, if i understand it correctly a branch is an actual filesystem directory structure?
[12:58] <Solipsist> as im sure yoy know in GIT and CVS, a branch is a meta concept and two branches can be the exact same directory structure and you can switch between them without having to have separate sets of directories for each branch, it seems more natural to me
[12:58] <ronny> currently yes
[12:58] <Solipsist> currently?
[12:59] <Solipsist> so i want to checkout the branch from my local repos?
[12:59] <ronny> Solipsist: i overheard that git style branching is on the way
[13:00] <Solipsist> that would be very welcome :)
[13:00] <Solipsist> anyhow, i got a directory with a .bzr directory and a set of subdirectories, i want to restore the files in the subdirectories to those in the local repos
[13:00] <Solipsist> so i type bzr checkout
[13:00] <ronny> its bzr revert
[13:00] <ronny> bzr revert reverts the workdir state
[13:01] <ronny> bzr checkout makes a new workdir from a branch of any location
[13:01] <Solipsist> ronny: look above, bzr revert throws an error
[13:02] <ronny> cna you paste the complete output of bzr revert, also use the -v parameter to get it more verbose
[13:03] <Solipsist> ronny: preferably not in a public channel, can i query you?
[13:04] <ronny> i'd prefer here since im not sure if i can help
[13:04] <ronny> well, make a private paste on paste.pocoo.org to begin with
[13:04] <Solipsist> ronny: i appreciate the offer but i cant post it publicly, plus it's bad manners pasting a lot of text in an IRC channel
[13:05] <ronny> Solipsist: start by making a private paste on paste.pocoo.org
[13:48] <Solipsist> bzr seems to have issues with special characters in filenames when dealing with different file systems, HFS+ on this machine and ext3 on the machines of the other committers
[14:03] <ronny> Solipsist: sounds like a unicode normalisation issue
[14:07] <Solipsist> perhaps, never had the same issue with git
[15:26] <mangerduchien> hi all
[15:29] <mangerduchien> I am facing a problem with bazaar and proxy. I am using Ubuntu Karmic Koala (9.10) with bazaar version 2.0.2 and I configured my environment with http_proxy="myproxy". However bazaar do not take the proxy into account
[15:29] <mangerduchien> Does anyone could help me ?
[15:34] <Pilky> Am I right in thinking that bzr ships with Ubuntu by default?
[15:36] <beuno> Pilky, it is not
[15:37] <beuno> it's in main, but not included in the default install
[15:37] <Pilky> right
[15:37] <mangerduchien> bzr is in Ubuntu repository and the last version is 2.0.0. I was having the same problem with this version so I installed 2.0.2 that can be found on https://launchpad.net/bzr/2.0
[15:38] <mangerduchien> but nothing changed
[15:42] <jam> morning all
[15:43] <mangerduchien> morning
[15:51] <jam> mangerduchien: generally, we respect http_proxy, are you sure you 'export'ed it appropriately?
[15:52] <jam> also, there is a bug in resolving lp: urls
[15:52] <jam> that is only fixed in the 2.1 series
[15:52] <jam> (xmlrpc needed custom code to handle proxies)
[15:52] <mangerduchien> i am facing the lp: url problem
[15:52] <mangerduchien> i have to use bazaar 2.1 ?*
[15:52] <jam> 2.1.0b4 will fix it for you, but I don't think it is packaged
[15:53] <jam> mangerduchien: well, the quick fix is to use "http://bazaar.launchpad.net/...." or "https://code.launchpad.net/..."
[15:53] <jam> the latter redirects to the former
[15:53] <jam> but lets you use  the short form
[15:53] <jam> so I tihnk
[15:53] <jam> bzr branch https://code.launchpad.net/foo
[15:53] <jam> will evaluate to the same as
[15:53] <jam> bzr branch lp:foo
[15:53] <mangerduchien> i am trying to get : lp:~launchpad-pqm/launchpad/devel
[15:54] <jam> mangerduchien: bzr branch http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel
[15:54] <jam> or bzr branch bzr+ssh://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel
[15:54] <mangerduchien> ok thanks, i'll try
[15:54] <jam> if you have registered an ssh key
[15:54] <jam> the latter should be faster
[15:55] <mangerduchien> ok, it seems to work
[15:55] <mangerduchien> thank you  very much
[15:58] <jelmer> hi jam, mangerduchien
[15:58] <mangerduchien> hi jelmer
=== kirkland` is now known as kirkland
=== deryck is now known as deryck[lunch]
=== fbond_ is now known as fbond
=== AnMaster is now known as AnMaster_
=== AnMaster_ is now known as AnMaster
=== deryck[lunch] is now known as deryck
[20:09] <Davidbrcz> Hi all
[20:09] <Davidbrcz> i'm a noob with bazaar
[20:09] <Davidbrcz> i want to extract a spefic version of a project
[20:09] <Davidbrcz> but i've not found in the doc a way do to it
[20:10] <Davidbrcz> someone could help me ?
[20:14] <mwhudson> Davidbrcz: bzr branch -r $revsion trunk old-version will work
[20:16] <Davidbrcz> mwhudson, hum
[20:16] <Davidbrcz> strange error
[20:17] <Davidbrcz> i want to extract the first revision of this http://bazaar.launchpad.net/~sean-pringle/musca/dev/files
[20:17] <Davidbrcz> i'v created a folder
[20:17] <Davidbrcz> and the i did bzr init; bzr branch http://bazaar.launchpad.net/~sean-pringle/musca/dev/files
[20:17] <Davidbrcz> but the second command gives me an error
[20:17] <mwhudson> oh
[20:18] <mwhudson> right, you want to do bzr branch http://bazaar.launchpad.net/~sean-pringle/musca/dev
[20:18] <Davidbrcz> why oh ?
[20:18] <mwhudson> not with the /files on the end
[20:18] <Davidbrcz> ok
[20:19] <Davidbrcz> i've got the current version
[20:19] <Davidbrcz> and to get the first one ?
[20:19] <Davidbrcz> hum
[20:19] <Davidbrcz> i get it
[20:19] <Davidbrcz> thx
[20:20] <Davidbrcz> :)
=== chancegarcia_ is now known as chancegarcia
[21:25] <toabctl> hi. i have a question:
[21:25] <toabctl> i want to merge abzr-branch with: bzr merge --pull lp:~mhall119/loco-directory/0.2-loco-events
[21:26] <toabctl> the merge works, but when i commit i have to add the commit message and after the commit there is no message or something about mhall119, but he was the guy who made the changes.
[21:27] <toabctl> can anybody help with this problem?
[21:27] <mwhudson> toabctl: try bzr log --include-merges
[21:31] <toabctl> mwhudson, that's it. thanks a lot!
[21:32] <mwhudson> toabctl: bzr qlog (from qbzr) or bzr viz (from bzr-gtk) might be interesting too
=== khmarbaise_ is now known as khmarbaise
=== jam1 is now known as jam
[22:05] <wgrant> If I look at http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/gnome-chemistry-utils/lucid/revision/19, I see that there are two merges involved. If I click on one of the merges, it says that it was merged at revision 18.
[22:05] <wgrant> Is that a Loggerhead bug?
[22:13]  * beuno looks
[22:13] <beuno> wgrant, it does look like a LH bug
[22:14] <beuno> could you file it?
[22:14] <wgrant> beuno: Sure.
[22:14] <beuno> thanks
[22:14] <wgrant> I've noticed it on a couple of other branches too, so it's probably universal.
[22:15] <poolie> hello beuno, wgrant
[22:16] <wgrant> Morning poolie.
[22:16] <beuno> hey hey poolie
[22:16] <beuno> wgrant, I have a suspicion on what it could be
[22:16] <beuno> my next bug to fix is in bzr-upload, but I may tackle that one tomorrow
[22:21] <wgrant> Bug #499614
[22:21] <ubottu> Launchpad bug 499614 in loggerhead "Merged revision is one less than it should be" [Undecided,New] https://launchpad.net/bugs/499614
[22:21] <wgrant> Hm, not long to go now.
[22:32] <poolie> till 500k?
[22:39] <mwhudson> hm, i was sure i'd fixed that...
[22:40] <mwhudson> maybe it's time to update the loggerhead that launchpad uses
[22:41] <poolie> hi jam, spiv, igc
[22:41] <jam> hi poolie
[22:41] <poolie> thanks for the reviews
[22:43] <jam> poolie: thank *you* for doing mine :)
[22:43] <jam> poolie: small update on the "set a larger socket size for transmission"
[22:43] <jam> as near as I can tell
[22:43] <jam> ssh itself will allow up to 2MB to be written to stdin
[22:44] <jam> before it blocks
[22:44] <poolie> k
[22:44] <jam> well, at least our 'out.write()' gets to write about that much
[22:44] <jam> certainly > 1MB
[22:44] <jam> at least, after the last server side "I wrote XX bytes" I see 28 64kB reads on the local side
[22:45] <poolie> jam, regarding update -r
[22:45] <jam> and many of the writes finish in 0.000 s
[22:45] <poolie> ok that's not surprising
[22:45] <jelmer_> ooh, update -r is finally happening ? :-))
[22:45] <poolie> i think this branch is worth adding regardless of where we think it will end up
[22:46] <jam> poolie: I approved your changes
[22:46] <poolie> jelmer_: https://code.edge.launchpad.net/~mbp/bzr/45719-update-r/+merge/16476 reviews welcome
[22:46] <poolie> and hi
[22:46] <jam> certainly it shouldn't block on internal disagreement, which I think blocked it so far
[22:46] <jam> which is a bit silly
[22:46] <poolie> you're definitely coming to vila's villa?
[22:47] <jam> wow... fetching in 'groupcompress' order generated 70.5MB, vs 50MB fetching in 'unordered' ...
[22:48] <jam> poolie: are you sure Calvin Rose's email isn't spam :)
[22:49] <poolie> jam: i had to moderate it too
[22:49] <poolie> which was a bit sad
[22:49] <poolie> i did wonder
[22:49] <jam> poolie: I realized you moderated it from the timestamp, which is why I brought it up
[22:51] <poolie> jelmer, do you have any idea based on knowledge of cifs why in bug 498378, after renaming a directory, we don't immediately see it under the new name?
[22:51] <ubottu> Launchpad bug 498378 in bzr "Lockdir disappeared after being renamed" [Medium,Incomplete] https://launchpad.net/bugs/498378
[22:51] <jam> poolie: speaking of which, just checking that vila's villa is start Mon Jan 25, leave after Fri Jan 29th
[22:51] <poolie> i can imagine there is some cache incoherency or something
[22:51] <poolie> but if we know what specifically it is, we might be able to work around it
[22:52] <poolie> correct
=== lifeless changed the topic of #bzr to: Bazaar version control  | try https://answers.launchpad.net/bzr for more help | http://bazaar.canonical.com/ | http://irclogs.ubuntu.com/ | Patch pilot: mbp | bzr 2.1.0b4 and 2.0.3 released
[23:15] <lifeless> bombs away
[23:24] <poolie> on testtools?
[23:24] <lifeless> yes
[23:55] <mwhudson> does "NotImplementedError: SilentUIFactory doesn't support make_output_stream" mean anything obvious to anyone?
[23:56] <spiv> mwhudson: apart from the bleeding obvious?  Not to me :)
[23:59] <mwhudson> darn