[00:02] _habnabit: qlog/vis are nicer than the dot output, I think :) [00:02] <_habnabit> It's still churning away at making the dot output. [00:03] _habnabit: churning away in the graph-ancestry command, or in dot? [00:05] I wouldn't expect graph-ancestry to need much time, but I would expect dot could be challenged by a large graph. [00:05] <_habnabit> dot was being slow. [00:06] <_habnabit> I'm also building python at the same time. [00:06] \o spiv [00:09] <_habnabit> Also this dot output is pretty sweet [00:09] <_habnabit> It really just shows merges, which is what I wanted [00:09] <_habnabit> I don't care about individual revisions [00:11] maxb: you legend [00:11] I'm not sure I deserve that just for deleting some cruft :-) [00:12] Hmm, we need to define an actual policy for when to promote things to the stable ppa [00:12] but for now, I think I shall just go ahead and promote bzr 2.2.2 since I've just noticed we haven't ye [00:12] t [00:13] wfm [00:30] poolie: heh [00:30] poolie: o/ [00:34] poolie: You did review=approve on my hydrazine mp - I take it you also mean merge=approve? [00:42] yes === oubiwann_ is now known as oubiwann === Leonidas_ is now known as Leonidas [03:06] Hooray, tests passing again. Now all I need to do is split up the new work into the appropriate prerequisite branches... [03:34] yay === lifeless_ is now known as lifeless === lifeless_ is now known as lifeless [05:58] * spiv idly wonders how many tests he's run today... hundreds of thousands I suppose. [06:00] \o/ [06:00] parallel much? [06:01] lifeless: always [06:02] Well, mostly :) [06:02] bzr alias pselftest='selftest --parallel=fork' [06:05] spiv: nice [06:06] I'm glad its getting loved :) [07:03] hello all ! [07:04] maxb: I was waiting for bzr-explorer to be upgraded to 1.1.2 before promoting [07:04] maxb: but that could come later anyway [09:59] Hi! [09:59] what are some good tools to model the structure of a VCS? [10:08] hi guys, i'm getting an error trying to access a branch over https from a location served with loggerhead - the error i get is bzr: ERROR: Server sent an unexpected error: ('error', "'NoneType' object has no attribute 'endswith'") [10:08] but I can't seem to see anything in log files on the server end to get a trace [10:09] Glenjamin: wow, this is even more obscure for me :) Are you using the most recent version of bzr/loggerhead on the server ? [10:10] i think i'm using the apt version [10:10] one sec [10:11] 1.17 [10:11] Glenjamin: Also, IIRC loggerhead can be configured in various ways, including having some sort of private apache instance or something, did you check the apache logs too ? (Or is it a case where logs are lost when used with some web server app framework..) [10:11] in this case i'm proxying through to serve-branches [10:12] I think you want to retry later with mkanat (he doesn't appear to be online right now) [10:13] there appears to be a stable 1.18, any idea if there's a PPA? [10:13] hmm, they may be several even... let me check [10:14] Glenjamin: running lucid or maverick ? [10:14] lucid [10:14] stable bzr ppa carries only 1.17 [10:16] same for proposed :-/ [10:16] and beta [10:17] Glenjamin: and the loggerhead project on lp mentions only the source tarball, that's all I know about it, sorry [10:18] no probs, thanks for looking at it [10:18] Tiriel: what structure are you referring too ? bzr internals ? history of a given branch ? relationships between branches ? [10:19] I could get it to work by proxying smart server requests to bazaar on wsgi instead of loggerhead, but its not that important on that server - was just going to try and get simple http reading for when we dont have ssh [10:19] relationships between branches, and maybe branch history as well [10:20] Tiriel: try 'bzr qlog branch1' and 'bzr qlog branch1 branch2 ... branchn' from the qbzr plugin [10:20] the branch-ancestry command does something like that from bzrtools iirc [10:21] branch-history [10:23] Yeah, well, I was lookin for something more like UML modeling for version control systems [10:23] I don't have a deployed system at the moment [10:23] there's graph-ancestry - that outputs something in dot === Meths_ is now known as Meths [10:55] hi, I have a quick question: when I check out an svn repository with bzr-svn, it starts building a cache in ~/.cache/bazaar/svn. I don't want it to put it in $HOME, as that's on the network and really slow. Can I tell bzr-svn to put it somewhere else? [10:56] pfarrell: you should be able to make that directory a symlink to somewhere else [10:57] true, yep [10:57] thanks for the suggestion === oubiwann is now known as oubiwann_ === oubiwann_ is now known as oubiwann [13:11] Hi, I am trying to merge a branch containing only one revision and then throw away the changes and replace them with my own. However, when I bzr revert after "bzr merge . -r:tag" the merge is forgotten too. [13:12] I thought I had to use "--forget-merges" to make bzr bzr forget the pending merge. [13:13] is this the expected behaviour? [13:41] alf_: The way it works is as follows: [13:41] 'bzr revert' reverts tree content and pending merge tips [13:41] 'bzr revert ' reverts the tree content specified [13:42] 'bzr revert --forget-merges' reverts only pending merge tips [13:42] maxb: yes, that makes sense, thanks! [14:31] maxb: regarding ppa promotion, I was waiting for bzr-explorer-1.1.2 before using lp-promote-ppa for the first time ! (You broke my toy :-) [14:32] maxb: not a problem anyway, it's good to have 2.2.2 deployed [15:10] Hello! We use VSS here with more or less success. Well, now our team gets bigger and the VSS data-file errors more. I want to go to a DVCS. Well, I checked their features and ma happy with them. But!!!! No shared files?? can it be possible? We have all over the place shared files. I think that because I read it in the VSS2Git documentation. So I hope Bazaar can do that. [15:19] hi all. Is there any examples of how can I do a merge programmatically from Python? I found bzrlib.merge.merge_inner(), but it does seem to only add changes and not revisions. Should I just something like what is done in bzrlib.builtins.cmd_merge? [15:21] piranha: builtins is the best source of knowledge when it comes to bzrlib uses. 'merge' in particular does a lot there [15:21] UnhappyVssUser: Hi [15:21] vila: yeah, it seems so... Ok, thank you, will continue to dig. [15:21] UnhappyVssUser: What do you mean by shared files? [15:22] jam: hello ! [15:22] morning vila [15:23] jam: I'm freezing 2.3b4, what can you tell me about bug #602614 and bug #680763, should I just remove the milestone ? [15:23] Launchpad bug 602614 in Bazaar "Out of memory error on auto repacking" [High,Confirmed] https://launchpad.net/bugs/602614 [15:24] Launchpad bug 680763 in Launchpad Bazaar Integration "bzr to launchpad is slower than to devpad" [Medium,Triaged] https://launchpad.net/bugs/680763 [15:25] vila: can you just retarget it? poolie asked me to keep them on milestones so we see them easily as work items [15:25] hmm, so I'll retarget them to 2.3.0 then [15:26] jam: done === naoki^ is now known as inada-n [15:47] amazing... I manage to make a typo ending in a line containing 'torturer'... caught by make check-dist-tarball... === beuno is now known as beuno-lunch === vila changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: jam | 2.3b4 is frozen, installers build time ! (rm vila) === deryck is now known as deryck[lunch] === oubiwann is now known as oubiwann_ === oubiwann_ is now known as oubiwann [17:47] If I have a checkout, what is the shorthand to reference it (ie. parent is to :parent as checkout is to....)? [17:47] like the remote branch, not the local one [17:47] Hello. If some branch has stopped mirroring from our internal host to launchpad (for some unknown reason), who should I contact? [17:47] any lp admin here? [17:48] jam: hello! do you know? ^ [17:49] guilhembi, #launchpad would be the better place to ask [17:49] guilhembi, whats the branch? [17:49] cody-somerville: ok, I'll go ask there [17:49] the branch is [17:49] https://code.launchpad.net/~mysql/mysql-server/mysql-trunk [17:49] cody-somerville: It might be :bound [17:49] "next mirror: disabled". [17:50] cody-somerville: "bzr help location-alias" [17:50] cody-somerville: bzr help location-alias [17:50] :bound [17:50] Ooh, I didn't know about that help page! I was just digging in the source code. [17:50] thanks [17:50] * guilhembi goes to #launchpad [17:51] guilhembi, Yea. It looks like you'll need to ask a launchpad admin for help. === beuno-lunch is now known as beuno [18:42] hi all! I am trying to install setuptools_bzr in a Python 2.4 environment, but it fails with "AttributeError: 'KnitPackRepository' object has no attribute 'get_revision_inventory'" [18:43] already tried with bzr 2.2 and 2.3b4 [18:43] any ideas why this is happening? [18:44] servilio: Repository.get_revision_inventory() was deprecated and then removed in 2.2. [18:45] servilio: FWIW you should use Repository.get_inventory() AFAIK, though this doesn't help you too much if the problem is in setuptools_bzr. [18:47] Peng: thanks! I suspected something like was happening, but I haven't kept track of the bzr internals [18:48] I tried to install bzr 2.1, but there is no downloadable tarball in pypi looks like === Tak|Work is now known as Tak === Meths_ is now known as Meths [21:31] mornin everybody :) [21:36] morning [21:37] 'morning peitschie, thumper [21:37] jelmer_: hey [21:38] jelmer_: I'd love some comment on my email to the bzr list :) [21:38] mornin jelmer_ [21:39] mornin thumper :) [22:36] hi all [22:44] mornin poolie [22:46] Morning poolie, peitschie. [22:47] (plus plenty other people...) [22:47] hi there [22:47] hiya spiv