[00:56] it seems bzr explorer does not like huge trees [00:58] http://bpaste.net/show/24322/ [01:17] hi [01:17] yes it's a known bug [01:17] i thought bialix was going to turn file watchers off by default [01:18] it is too risky to be on til it's more stable [01:18] it was going to be turned off on windows by default [01:18] cause of its wonderful practice of one thing locking a file and then nothing else can use it [01:18] i'm on a mac atm [01:20] ah, maybe it should be off everywhere [01:21] well [01:21] this is a pretty extreme case, i'm just running a script (thats in a bzr directory) and by default it outputs stuff to the same dir the script is in [01:21] and it has 6,721 items totaling 800 mb sooo =P === lifeless_ is now known as lifeless [01:34] be back on later~ [03:22] bzr 2.5 is released, right? Does that mean in will be in ppa:bzr/ppa soon? [03:42] afc, right, quite soon === SamB__ is now known as SamB [04:09] poolie: cheers (just hit a github repo that I'm trying to branch that gave me an error to do with nested trees; I'm hoping that 2.5 will parse it) === echo-are` is now known as echo-area [05:45] so, does bzr-git support pushing to github? [06:10] dont want to push to test it cause i dont wnat to mess up the branch >.> [06:40] mgrandi: afaik it does [06:40] well [06:40] one way to find out [06:40] haha [06:45] and aww yeah thats sexy. [06:51] requires a dpush but it works perfectly. [06:59] anyway, bedtime~ [07:28] Hello all [07:28] I am going to host a private bazaar for an internal team development [07:28] but can't come across a descent doc/manual that goes through this... [07:29] especially users administration [07:30] I still have no idea how this works, assigning branches to specific users, setting read-only one a mainstream branch for all users but one for example... etc [07:30] could anyone point me to the right direction? [07:30] Thanjs in advance [07:50] ... [08:02] morning [08:17] hi mgz [08:18] hi! [10:17] o/ jelmer, mgz [10:17] hey poolie [10:18] hey poolie [10:19] hi there, sorry i missed you before [12:32] i am trying to setup a daily build recipe for a svn import, but i obviously have problems with the the deb-version string (or to be more precise with fulfillment of its prerequisites). [12:33] i have included a nest-part statement for the debian part of the ubuntu package [12:33] the first line of the recipe is bzr-builder format 0.4 deb-version {debupstream-base}-0~r{svn-revno} [12:35] http://paste.ubuntu.com/860449/ is the complete recipe + bzr dailydeb output [13:04] stefanct: hi [13:04] hi jelmer [13:04] stefanct: I think the 0.4 recipe format still has issues on launchpad [13:05] stefanct: you might want to try 0.3 (though that unfortunately doesn't support some of the variables you're using [13:05] agreed@0.4 but i am testing locally. shouldnt it work there? [13:05] stefanct: it should work locally indeed [13:06] stefanct: there isn't any packaging in lp:flashrom I guess? [13:06] in that case you want {debupstream-base:packaging} [13:07] a "packaging" directory? [13:07] stefanct: packaging refers to the branch you're nesting [13:08] stefanct: your deb-version has {debupstream-base} which would take the version string from the 'debian/changelog' file in the root branch (lp:flasrom) [13:08] except there is no such file in the root branch [13:08] {debupstream-base:packaging} makes it look at the branch nested under the 'packaging' name [13:09] ah! [13:09] are there any good docs about that? this is all missing from the help.launchpad.net pages :/ [13:10] well.. i should recheck that first before blaming.. :) [13:10] "Here fix-build is a unique short name that we'll use to refer to this branch throughout the recipe." my bad. [13:13] stefanct: see also 'bzr help builder' [13:14] ah. i was looking at the man page... === RickCogley_ is now known as RickCogley [13:17] jelmer: thanks a lot! --no-build completes now successfully locally and i think i know enough to solve the ppa build on my own [13:19] cool [13:25] but it explodes ofc on launchpad due to https://bugs.launchpad.net/launchpad-buildd/+bug/915505 :) [13:25] Ubuntu bug 915505 in Launchpad Auto Build System "bzr: ERROR: exceptions.AttributeError: 'cStringIO.StringI' object has no attribute 'split'" [Critical,Triaged] [13:27] stefanct: yep, that's the bug I had in mind earlier [13:29] last question hopefully: is it possible to have comments in recipes? # obviously is not ignored :) i would like to add a 0.4 template for later when that bug is solved [13:30] stefanct: yes, you can have comments but they have to start at the beginning of a line [13:30] I'm not sure if launchpad preserves them [13:38] it does not [13:43] stefanct: I guess you can put it in the recipe description [13:44] good idea, but i dont trust launchpad... ill save it locally too :) === yofel_ is now known as yofel === deryck is now known as deryck[lunch] === deryck[lunch] is now known as deryck [18:17] Hi. [18:18] Is it possible to sync-pipeline and then work with the pipeline in the other location? [18:19] I have done this: 1) created a pipeline and done some changes. 2) bzr sync-pipepile /my/usb/flash/memory. 3) bzr sync-pipeline /home/wilx/mysharedrepo. [18:19] Now, it has created two branches in the shared repor with the names of the pipes in the pipeline. [18:19] But the branches are not the pipeline it seems. [18:20] I cannot bzr swp in them. [18:21] While bzr pipes still shows the pipeline pipes in each of the branches. [18:21] Ideas? [18:34] jelmer: first binary package just built successfully by the recipe, thanks again and bye :) [19:11] wilx: hi [19:11] wilx: no idea, you might want to talk to abentley [19:13] wilx: you ought to be able to, but I haven't tested it recently. [19:23] http://codepad.org/AUt0awX5 [19:24] Here is a log of what I have done. The bottom shows the problem. [19:35] wilx: Right, you need to create a lightweight checkout of branch1 or pipe2. [19:37] Would that be bzr co --lightweight in the branch1 dir? [19:38] wilx: co --lightweight $PATH_TO_BRANCH1 anywhere except the branch1 dir. [19:39] Ah. [19:42] I see. It works that way. [19:42] However it makes layout different from the inital pipeline which is surprising. [19:44] wilx: I mostly use sync-pipeline for pushing to Launchpad, and producing that sort of layout wouldn't work. Launchpad needs the branches to be separate. [19:46] I see. [19:46] Maybe there should be a switch to allow the original repo layout for other destinations/transports. [19:48] wilx: probably the easiest way to reproduce that layout manually is to colo-init, and then sync-pipeline into colo/.bzr/branches [19:55] wilx: btw, until recently, the layout produced by reconfigure-pipeline is one I never used. I would do "bzr init-repo --no-trees branches; bzr init branches/branch1; bzr checkout --lightweight branches/branch1/" [19:56] I see. [20:00] wilx: if you're using reconfigure-pipeline, init-repo isn't strictly necessary. reconfigure-pipeline creates a shared repository. [20:05] hey all [20:05] hey jono [20:05] hey jelmer! [20:06] if I have a branch that I want to merge into another one, and the branch I want to merge in has much of the same code structure, but re-factored, is bzr smart enough to find the right code fragment and merge the branch? [20:07] jono: the branches aren't related in any other way? [20:07] jelmer, so this is what is happening: [20:07] I have a branch and someone is re-factoring the code [20:07] but moving the code around, changing some of the method names etc [20:07] much of the original code logic is the same [20:08] but I want to write some changes and I am not sure if I should hold off [20:08] Are your changes conflicting his changes? [20:08] Then hold off. Otherwise proceed. [20:09] wilx, this is the thing, I don't know - I suspect they won't because he is just moving some code around - the code itself doesnt change [20:09] but as an example if I patch my_func() and the file my_func() is in changes, would the patch still apply? [20:09] jono: if you're going to be changing the same code that he is moving around then I would wait [20:09] thanks jelmer [21:21] jono: best way to tell: just try merging :) [21:21] jono: you can always do your changes on top of his branch, rather than in trunk [21:21] jono: or you can do yours in trunk and let him(or her) merge from you before they submit [21:31] jelmer: I just saw your bug on indicator-jenkins - I didn't think anyone knew about that yet [21:32] jelmer: the bug's been fixed in trunk, and there's a package building - should be done in 1 hour [21:33] * jelmer hugs thomi [21:33] I don't remember where I learned about indicator-jenkins, but it seemed like a nice thing to try [21:33] let me know if you have any more problems with it. I'll get it working well then send an email out to the canonical QA lists... [21:37] jelmer: Hey, thanks for the quick patch for the bzr:// URI mirroring. [21:59] thanks lifeless [22:29] hi all [22:34] hey poolie [22:44] hi poolie, wgz