[12:04] hrmpf [12:04] it seems that a push didn't, in fact, include the nested tree :( [12:05] had you committed? [12:05] yes [12:05] does 'bzr branch mytree mynewtree' include the upstream subtree ? [12:05] and did you use bzr push, or bzr svn-push? [12:05] lifeless: when I do svn log on that branch, there's a missing revno corresponding to when I merged [12:06] lifeless: svn-push === jelmer_ [n=jelmer@157pc196.sshunet.nl] has joined #bzr [12:06] actually, it might be due to another thing [12:06] jelmer_: good timing === jelmer_ is now known as jelmer [12:06] assuming you are here :) [12:06] that SVN repo uses a two-level branch structure [12:06] so branches/owner/branchname [12:07] hey lifeless [12:07] 08:04 < lapthrick> hrmpf [12:07] 08:04 < lapthrick> it seems that a push didn't, in fact, include the nested tree :( [12:07] 08:05 < lifeless> had you committed? [12:07] 08:05 < lapthrick> yes [12:07] 08:05 < lifeless> does 'bzr branch mytree mynewtree' include the upstream subtree ? [12:07] it's actually evening here (-: [12:07] 08:05 < lifeless> and did you use bzr push, or bzr svn-push? [12:07] 08:05 < lapthrick> lifeless: when I do svn log on that branch, there's a missing revno corresponding to when I merged [12:07] 08:06 -!- jelmer [n=jelmer@157pc196.sshunet.nl] has quit [Remote closed the connection] [12:07] 08:06 < lapthrick> lifeless: svn-push [12:07] and it did bail out with "not a valid SVN branch" during that push [12:07] so I assume it was trying to push that sub-tree after pushing the parent tree and then it died [12:08] jelmer: so, I need support for two-level branch scheme for the repo I'm using [12:09] though it's actually optional, some branches we have are directly unders branches/, some live in branches/owner/ [12:09] lifeless: Thanks [12:10] jelmer: I also submitted a bug report and have a scenario where merge-into manages to kill bzr-svn for you :) [12:10] lapthrick: 'bzr svn-branching-scheme' should be able to tell you what branching scheme is being used for a repository atm [12:11] bzr pokerolymp:2090/> svn-branching-scheme svn+https://beta.aimido.de/svn/src2/ [12:11] trunk [12:11] branches/* [12:11] tags/* [12:12] you'd probably want to add 'branches/*/*' there as well [12:12] jelmer: how can I do that? [12:13] bzr.dev svn-branching-scheme --set [12:13] jelmer: so just svn-branching-scheme --set branches/*/* ? [12:15] lapthrick: just bzr svn-branching-scheme --set [12:15] that should put you into an editor allowing you to edit that list [12:15] ahh [12:15] the branches/*/* should probably be the first line [12:17] bzr pokerolymp:2090/> svn-push svn+https://beta.aimido.de/svn/src2/branches/mathrick/pokersource/ [12:17] Unhandled error: [12:17] hmm [12:17] I suspect that branch might be broken by the previous botched push [12:18] no, actually it happens for every branch I try to push to [12:18] jelmer: any idea where I should poke it? [12:19] lapthrick: what unhandled error exactly? [12:19] jelmer: that's exactly what it says. Unhandled error and then nothing [12:20] can you try running with BZR_PDB=1 set and seeing what line it bails out on? [12:21] jelmer: http://pastebin.com/m68ba42d8 [12:23] igc: I have all tests passing in packs [12:23] ah, looks like ListBranchingScheme still needs a is_parent_branch() implementation [12:23] that's great lifeless [12:24] igc: about to send a patch that cleans up weave stuff - and makes the tests pass ;) [12:24] ok - I'll have a look [12:25] jelmer: is there an easy fix for that? [12:26] lapthrick: looking at it atm [12:29] lapthrick: btw, I don't think I've seen any bugreport on the merge-into/bzr-svn problem [12:32] igc: mail sent [12:32] cool [12:33] btw, up early because it's school holidays here now - best to get as much done as early as possible :-) [12:34] heh [12:34] I got 7 hours solid sleep.... and then woke up at 0430 [12:35] jelmer: no, I didn't submit a bugreport, as it wasn't entirely clear what's happening [12:37] lapthrick: If you can still reproduce it, a bug report would be very useful. merge-into and bzr-svn should be able to work ok together [12:39] jelmer: sure [12:45] jelmer: actually it seems I'm able to trigger two separate errors [12:45] mathrick@hatsumi:/tmp/merge$ bzr merge-into file://$PWD/../test/trunk test [12:45] bzr: ERROR: Repository KnitRepository('file:///tmp/merge/.bzr/') is not compatible with repository SvnRepository('file:///tmp/merge/../test') [12:45] jelmer: that's on a local test repo [12:46] jelmer: http://pastebin.com/m63022805 [12:46] this one is on the actual repos I wanted to merge-into [12:47] lapthrick: that first error should be fixable by upgrading the bzr repository [12:47] lapthrick: see the FAQ in bzr-svn's 0.4 branch [12:48] lapthrick: I'll fix the other one [12:48] jelmer: great, thanks === Verterok [n=ggonzale@184-220-114-200.fibertel.com.ar] has joined #bzr [01:11] igc: repository branch that passes all tests pushed [01:11] cool. Did you want me to run any tests here? [01:13] not as such [01:13] just letting you know [01:14] sure - thanks === jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr === asabil [n=asabil@ti0035a340-0469.bb.online.no] has joined #bzr [01:34] Pulling from the repository branch: bzr: ERROR: Revision {robertc@robertcollins.net-20070923224332-qy28l0g345rcyein} not present in "rev_storage.py-20051111201905-119e9401e46257e3". [01:35] Is it in the middle of a push or something? [01:39] no [01:39] revert back a couple of revisions [01:39] then pull again [01:39] termporary bokrage === mssever [n=mssever@75-106-9-198.cust.wildblue.net] has joined #bzr === michelp [n=michelp@69-30-72-119.dq1sf.easystreet.com] has joined #bzr [01:43] What, uncommit back a few revisions? === mssever [n=mssever@75-106-9-198.cust.wildblue.net] has left #bzr [] [01:44] yes [01:44] bbiab [01:44] before the 'fix test X' one, that broke it [01:45] uncommit + revert [01:45] ok, ciao, -> poolies [01:45] Oh, revert too. [01:48] Yeah, that worked. [01:48] Thanks. === jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr === poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr [02:11] lifeless: The branch: and ancestor: revision specs do a fetch. === arjenAU [n=arjen@ppp215-29.static.internode.on.net] has joined #bzr [02:15] hi [02:16] abentley, i think lifeless is on a train [02:16] poolie: Okay. No big rush. [02:16] (rebooting) === AnMaster [n=AnMaster@unaffiliated/anmaster] has joined #bzr === jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr === jrydberg_ [n=johan@213.115.45.46] has joined #bzr === poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr === BasicMac [n=BasicOSX@216.243.156.81.real-time.com] has joined #bzr === BasicMac [n=BasicOSX@216.243.156.81.real-time.com] has joined #bzr === BasicMac is now known as Basic === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr === Bambi_BOFH [n=kgoetz@gnewsense/friend/kgoetz] has joined #bzr === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr === Bambi_BOFH is now known as kgoetz === orospakr [n=orospakr@bas4-ottawa23-1177770446.dsl.bell.ca] has joined #bzr [03:42] Peng: cool [03:47] So what was wrong with it? === poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr [03:56] I broke it [03:56] then I unbroke it [03:56] you had the broken copy === igc food [04:00] Okay. === BasicMac [n=BasicOSX@216.243.156.81.real-time.com] has joined #bzr === BasicMac is now known as Basic [04:19] Peng: the details are pretty boring really; there was a failing test that was more important than I realised; and two variables being tested for equality that were of different types [04:19] Peng: but all tests pass now; so should all be good === fullermd blinks. [04:26] Underrating the importance of a failing test?? Who are you, and what have you done with lifeless? [04:28] its an experimental branch [04:29] I don't have a zero-tests failing policy for things that I'm doing open heart surgery on; I try for zero but its not always feasible. [04:29] Hrmph. Excuses, excuses. Getting soft in your old age... === jml_ [n=jml@203-113-250-169-static.TAS.netspace.net.au] has joined #bzr [04:39] lifeless: Oh, okay. === rml [n=Skippy@78.32.35.169] has joined #bzr === dous_ [n=dous@124.104.0.255] has joined #bzr === jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr === bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has left #bzr [] === jml_ is now known as jml === kgoetz [n=kgoetz@gnewsense/friend/kgoetz] has joined #bzr === bigdo1 [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr === NamNguyen [n=namnt@203.162.163.50] has joined #bzr === bigdo1 [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has left #bzr [] === bigdo1 [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr === BasicMac [n=BasicOSX@216.243.156.81.real-time.com] has joined #bzr [05:47] igc: ping [05:47] hi lifeless [05:48] want a quick call ? [05:48] sure [05:48] you at poolies? [05:48] up [05:48] or you can call me [05:48] yup [05:48] nah, call poolies [05:48] np [05:49] 2 minutes [06:15] New bug: #144352 in bzr "tag should refuse to tag null:" [Undecided,New] https://launchpad.net/bugs/144352 === BasicOSX [n=BasicOSX@warden.real-time.com] has joined #bzr [06:52] lapthrick: ok, the bug you posted to pastebin should be fixed now === rml [n=Skippy@78.32.35.169] has joined #bzr === Starting logfile irclogs/bzr.log === ubuntulog [i=ubuntulo@ubuntu/bot/ubuntulog] has joined #bzr === Topic for #bzr: The Bazaar Version Control System | http://bazaar-vcs.org/ | Bazaar 0.90 and 0.91rc2 are out - http://bazaar-vcs.org/Download | Please complete the Bazaar User Survey - http://www.surveymonkey.com/s.aspx?sm=L94RvLswhKdktrxiHWiX3g_3d_3d === Topic (#bzr): set by poolie at Wed Sep 12 03:35:03 2007 === mlh [n=mlh@c211-30-211-232.belrs1.nsw.optusnet.com.au] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === jml [n=jml@ppp121-44-213-76.lns1.hba1.internode.on.net] has joined #bzr === poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr [07:18] jelmer: hi? [07:19] poolie, hi === Verterok [n=ggonzale@184-220-114-200.fibertel.com.ar] has joined #bzr [07:29] jelmer: the one with merge-into svn://, or the one with push svn:// ? [07:29] lapthrick: merge-into [07:29] poolie: ping? [07:29] okay, lemme try [07:29] btw, I've only fixed the issue you reported, not actually tested merge-into with bzr-svn.. [07:32] jelmer: it seems to work fine [07:32] cool, great :-) [07:33] jelmer: do you have that push bug recorded somewhere, or should I put it in launchpad? [07:34] lapthrick: I just filed a bug report on launchpad, with you subscribed [07:34] good, thanks [07:34] poolie: Hi dere. [07:35] poolie: Is 0.91 blocked on something? === kgoetz [n=kgoetz@gnewsense/friend/kgoetz] has left #bzr [] === jelmer gets some sleep === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr === liw [n=liw@a91-154-119-10.elisa-laajakaista.fi] has joined #bzr [08:02] fullermd: no, just other work keeps getting ahead of it [08:02] liw, hi [08:03] poolie, greetingses [08:03] Coolies. Just making sure I didn't miss something on the list :) === abentley [n=abentley@bas8-toronto63-1088754407.dsl.bell.ca] has joined #bzr === bigdo2 [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr === bigdo1 [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr === jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr === pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr === hdima [n=hdima@idealer.cust.smartspb.net] has joined #bzr === Lo-lan-do [n=roland@mirexpress.internal.placard.fr.eu.org] has joined #bzr === vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr === CardinalFang [n=c@217.194.71.122] has joined #bzr === Zindar [n=erik@h188n1fls12o803.telia.com] has joined #bzr === hdima [n=hdima@idealer.cust.smartspb.net] has joined #bzr === GaryvdM [n=chatzill@mtngprs2.mtn.co.za] has joined #bzr [09:24] I have a branch in which I removed some files present in upstream, now it turns out I need them. What's the best way to restore them? === jamesh_ [n=james@canonical/launchpad/jamesh] has joined #bzr [09:27] lapthrick: revert [09:27] I think [09:29] lapthrick: revert is correct if it's simply current uncommitted work. [09:29] lapthrick: if numerous revisions have gone by since then, you'll have to do something more elaborate [09:30] the latter [09:30] would a reverse merge work? "bzr merge -r 42..41" [09:30] it suggests merge -r foo === mvo [n=egon@p54A640B8.dip.t-dialin.net] has joined #bzr [09:30] ... a kludgy way to do it would be to just copy the files [back] in, and `bzr add` them [again] [potentially using --file-ids or whatever to make sure it knows what you're up to] [09:31] liw: [that would assume the file removal was the only thing in that revision, although you could do that and then revert the parts you didn't want to, er, revert :)] [09:33] it seems that revert takes revision argument, but it also seems that I didn't, in fact , remove the dir I needed, I was just looking in the wrong place :) [09:36] aye, revert -r foo bar restores bar just fine [09:36] ciao for now, be back in a bit [09:37] AfC: we need to beat some sense into desrt [09:37] what with his silly delusions about git [09:37] lapthrick: are you a gnomer ? [09:37] lifeless: indeed [09:37] cool [09:37] indeed :) [09:37] AfC: btw, did I mention I have local initial commit faster than hg now ? [09:38] AfC: (not that hg are *my* benchmark, but they seem to be some folks' benchmark) [09:38] heading home, be back in a bit [09:38] see ya === vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr [09:39] hi all [09:39] hi vila [09:40] vila: looked into that curl bug perhaps? [09:40] lapthrick: 1) not yet, 2) I thought you found it was more on the bzr-svn front ? [09:41] vila: no, quite the opposite, I found it's a general libcurl-gnutls compat issue [09:41] lapthrick: more precisely ? Is that a problem in curl or a problem in the way we interact with it ? [09:42] lifeless: regarding my corrupted repo, I found that gutsy have changed the way nfs interacts with OSX [09:42] vila: I dunno, but last time you said it looked like an API compat bug and you need to look into it, since there was no error 77 as far as you knew [09:43] lapthrick: That point I didn't have time to check yet [09:43] ok [09:43] I'm not in a big hurry, I can use https+urllib for now, that repo isn't very likely to haxx me for not checking the cert properly [09:44] lapthrick: ok [09:46] lifeless: as I update gutsy as soon as the update-manager warn me, I can't know exactly if/what/when something went wrong, *but* this morning, the nfs mount from OSX failed at boot (but worked from command line...) until I add proto=tcp in /etc/fstab (using mount-v revealed that the mount succeeded with proto=udp) [09:48] as I can't reproduce the corruption by committing in the same conditions (to the best of my knowledge), I will consider that NFS was the cause (I don't really like leaving a possible corruption bug lying around, but I really can't see what to do to get a better diagnosis) [09:50] lifeless: I am currently reorganizing around a new repo and will keep the corrupted one for some weeks anyway as it looks as a perfect candidate to better understand many details (why 'bzr send -o -' needs to refer to a revision outside of the branches it should care of, for one :) === pmezard [n=pmezard@dhcp26-226.enst.fr] has joined #bzr === mwh [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr === jamesh_ is now known as jamesh === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr [10:18] vila: ok [10:18] oh, and I'm back :) [10:19] lifeless: :) I still feel bad about that corruption though... What is *your* feeling ? [10:20] vila: One of the lp developers has had similar corruption twice now; they use nfs. [10:20] lifeless: haaaa, what a relief, same symptoms ? zeroed revision ? [10:21] dunno exactly [10:23] lifeless: ok, will keep an open eye then (but I rarely commit from OSX these days anyway) === mrevell [n=matthew@canonical/launchpad/mrevell] has joined #bzr [10:24] lifeless: is there same way to check against this corruption from another data path or do we rely on the gzip crc ? [10:25] file sha will find it [10:26] ok, I'll try to look into that (if only to understand if bzr may have been tricked by nfs telling him, yes, the content have been written to disk, when in fact it has not) [10:27] that's one of the reason I didn't want to touch that repo if I was able to rebuild everything (which I'm close to have achieved) [10:29] lifeless: errr, scratch that, the commit was from the NFS server === Mez_ [n=Mez@ubuntu/member/mez] has joined #bzr === igc food === asabil_ [n=asabil@62.70.2.252] has joined #bzr [11:05] New bug: #144388 in bzr "Cannot do svn checkouts in a repository" [Undecided,New] https://launchpad.net/bugs/144388 === allenap [i=allenap@nat/canonical/x-3037a206c251a099] has joined #bzr === sverrej [n=sverrej@pat-tdc.opera.com] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === matkor [n=matkor@85.14.91.175] has joined #bzr === sabdfl [i=sabdfl@ubuntu/member/pdpc.silver.sabdfl] has joined #bzr === silwol [n=silberma@wosi02.synserver.de] has joined #bzr === CardinalFang [n=c@217.194.71.122] has joined #bzr === cfbolz [n=cfbolz@p54ABBA2D.dip0.t-ipconnect.de] has joined #bzr === dewd [n=dewd@201.9.147.182] has joined #bzr [11:55] New bug: #144394 in bzr "stderr from a bzr+ssh smart server process should not be sent to the client" [Undecided,New] https://launchpad.net/bugs/144394 === jnair [n=jayesh@203.123.188.10] has joined #bzr === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr === mvo_ [n=egon@p54A65FC9.dip.t-dialin.net] has joined #bzr === mvo__ [n=egon@p54A65FC9.dip.t-dialin.net] has joined #bzr === mvo__ is now known as mvo === gabe [n=gabriel@91.84.56.254] has joined #bzr === NamNguyen [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === dous_ is now known as dous === asabil [n=asabil@62.70.2.252] has joined #bzr === mvo [n=egon@p54A66696.dip.t-dialin.net] has joined #bzr === hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr === mrevell is now known as mrevell-lunch === herzel [i=herzel@gateway/tor/x-257cc1dfc7f708d5] has joined #bzr === bigdo2 is now known as bigdog === niemeyer [n=niemeyer@200.140.230.150] has joined #bzr === corporate_cookie [n=richie@seraphim.asbury.edu] has joined #bzr === cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr === schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr === silwol [n=silberma@wosi02.synserver.de] has left #bzr [] === Govan [n=Govan@62.254.178.211] has joined #bzr === matkor [n=matkor@EUROCZESCI.wbs.ssh.gliwice.pl] has joined #bzr === CardinalFang [n=c@217.194.71.122] has joined #bzr === RichardL [n=Skippy@78.32.35.169] has joined #bzr === mrevell-lunch is now known as mrevell === marianom [n=marianom@ubuntu/member/marianom] has joined #bzr === mw|out [n=mw@189.146.13.202] has joined #bzr === mw|out is now known as mw [02:50] New bug: #144421 in bzr "Using branch: revspec in stat blows up" [Undecided,New] https://launchpad.net/bugs/144421 === asabil [n=asabil@62.70.2.252] has joined #bzr === allenap [i=allenap@nat/canonical/x-a744796f36af6bfd] has joined #bzr === mvo_ [n=egon@p54A652B1.dip.t-dialin.net] has joined #bzr === mvo__ [n=egon@p54A67253.dip.t-dialin.net] has joined #bzr === bwinton [n=bwinton@mail.phantomfiber.com] has joined #bzr === mvo__ is now known as mvo === asak [n=alexis@200-171-75-98.dsl.telesp.net.br] has joined #bzr === asabil_ [n=asabil@62.70.2.252] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === asabil_ [n=asabil@62.70.2.252] has joined #bzr === NamNguyen [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr === keir [n=keir@206-248-134-7.dsl.teksavvy.com] has joined #bzr === herzel [i=herzel@gateway/tor/x-f068b8419f4e0198] has joined #bzr === corporate_cookie [n=richie@seraphim.asbury.edu] has joined #bzr === p4tux [n=p4tux@189.169.63.63] has joined #bzr === schierbeck [n=daniel@192.38.109.188] has joined #bzr === schierbeck [n=daniel@192.38.109.188] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === asabil_ [n=asabil@62.70.2.252] has joined #bzr === asabil_ is now known as asabil === Mez [n=Mez@ubuntu/member/mez] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === BasicMac [n=BasicOSX@warden.real-time.com] has joined #bzr === Sigma [n=yann@pdpc/supporter/active/Sigma] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === cfbolz [n=cfbolz@p54AB8FCB.dip0.t-ipconnect.de] has joined #bzr === orospakr [n=orospakr@132.213.238.4] has joined #bzr === quicksilver [n=jules@212.69.38.59] has joined #bzr === schierbeck [n=daniel@192.38.109.188] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === AnMaster_ [n=AnMaster@unaffiliated/anmaster] has joined #bzr === AnMaster_ is now known as AnMaster === CardinalFang [n=c@217.194.71.122] has left #bzr ["Leaving"] === Govan [n=Govan@62.254.178.211] has left #bzr [] === abadger1999 [n=abadger1@65.78.187.68] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === zyga [n=zyga@ubuntu/member/zyga] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === BasicOSX [n=BasicOSX@errant.real-time.com] has joined #bzr === schierbeck [n=daniel@192.38.109.188] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === asabil [n=asabil@62.70.2.252] has joined #bzr === cprov is now known as cprov-lunch === herzel [i=herzel@gateway/tor/x-5b7127646a9012da] has joined #bzr === jrydberg [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr === juliank [n=juliank@f049170213.adsl.alicedsl.de] has joined #bzr [05:56] Does launchpad support the smart server? [05:56] Yes. [05:56] It's even recommended now1 [05:56] ! [05:56] Not sure about bzr+http. [05:56] Cool. [05:56] Oh. [05:56] Does that mean I would need an account of some sort to have ssh? [05:57] Yes. [05:57] I didn't think it did, only the +ssh variant. === abadger1999 is not an ubuntu dev [05:57] I tried to set up a bzr+http server once. It didn't work. Someone else had the same experience too. === Peng wanders off. [05:57] I'm making some speed tests for a blog post and wanted to include smart server times to lp. [05:58] Guess I'll just include times to a server I have ssh on and note any discrepancy between doing a plain branch operation and smart server branch operation compared to lp. [05:58] I don't think bzr+http is in general significantly faster than http. It'll gain a little, and the special case of initial mirror may be a good bit faster from the tarball sending thing, but that's pretty fringe... [05:59] Good to know. Is http in general faster than bzr+ssh? [05:59] err.. as fast as. [06:00] Well, theoretically (mod protocol setup overhead), bzr+ssh should be the same speed as bzr+http [06:00] Somewhat axiomatically, http should be slower than bzr+http by some non-zero factor; I think that factor is pretty small outside of very specific cases, though. === Zindar_ [n=erik@h188n1fls12o803.telia.com] has joined #bzr [06:01] Okay. Sometime when I'm less busy I'll have to run some more in-depth tests. [06:01] Now, bzr+ssh is noticeably faster than sftp. But that's mostly on writes (and the specific limitations of sftp in that realm), not reads, so that doesn't translate over to http. [06:02] Okay. And the initial checkout? (because of the tarball sending) [06:03] Too, there are the currently in-progress (and vaguely hoped for in 0.92) smart server improvements that should make a drastic improvement there, by making the smart server actually smart. It's pretty dumb overall... === dpm [n=dpm@p54A13C3D.dip0.t-ipconnect.de] has joined #bzr [06:04] Well, when it kicks in, that should make the transfer bandwidth limited at the size of the repository. [06:04] heh, my quick blog post is just to address someone who claimed that bzr branch awn (a project on lp) took 10 minutes. So the smart server will definitely add another interesting number to the mix. === Zindar__ [n=erik@h188n1fls12o803.telia.com] has joined #bzr === p4tux [n=p4tux@189.169.63.63] has joined #bzr === Lo-lan-do gently pokes jelmer [06:18] Does anyone know what the scope of this warning in http_smart_server.txt is? [06:18] **This feature is EXPERIMENTAL and is NOT SECURE. It will allow access to [06:18] arbitrary files on your server.** [06:19] Does it refer to the particular configuration in the file or to limitations of running bzr+http at all? === fog [n=fog@debian/developer/fog] has joined #bzr === liw [n=liw@a91-154-119-10.elisa-laajakaista.fi] has joined #bzr [06:28] abadger1999: It's out-of-date. [06:29] Even better :-) === Zindar [n=erik@h188n1fls12o803.telia.com] has joined #bzr === herzel [i=herzel@gateway/tor/x-aaa07f19bb697f08] has joined #bzr [06:30] abadger1999: Personally, I'd like to know one of the developers went through the bzr+http code, but I'd be willing to use it. [06:30] abadger1999: Tell me if you get it to work! [06:31] Peng: Cool. I'll be sure to mention it if I get it running! === liw [n=liw@a91-154-119-10.elisa-laajakaista.fi] has left #bzr ["The] === phanatic [n=phanatic@dsl5402BA1B.pool.t-online.hu] has joined #bzr === jrydberg__ [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr === herzel [i=herzel@gateway/tor/x-cd2c1bf736ecab5c] has joined #bzr === jrydberg [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr === p4tux [n=p4tux@189.169.63.63] has joined #bzr === p4tux [n=p4tux@189.169.63.63] has joined #bzr === et_ [n=et@ip111.215.dsl-acs2.sea.iinet.com] has joined #bzr === et_ [n=et@ip111.215.dsl-acs2.sea.iinet.com] has left #bzr ["Leaving"] === bac is now known as bac_afk [07:19] fullermd, abadger1999: there's also the history-horizon stuff, which should make "bzr branch" take about the same time as a tarball download of source snapshot without history [07:19] i think that's post-1.0, though, so December+ [07:20] Nifty. I didn't realize history horizon would improve performance. [07:20] Does that mean that it doesn't download history unless it's necessary? [07:20] Well, in the degenerate case, it drops you to a equivalent 'checkout --lightweight' time. Which doesn't really crank up spiffiness until the smart server gets rather smart. [07:25] abadger1999: the idea is to make it do "asm much as it can" with the history it has availble [07:25] so, bzr log would show the revisions it has [07:25] you could fetch more revisions to do more [07:26] merge would bring in just the revisions needed to do the merge === allenap [i=allenap@nat/canonical/x-74fb1088cbecdc20] has joined #bzr [07:36] Thanks for the explanation. === GaryvdM [n=chatzill@dsl-241-254-221.telkomadsl.co.za] has joined #bzr === cprov-lunch is now known as cprov === bwinton [n=bwinton@mail.phantomfiber.com] has joined #bzr === hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr === schierbeck [n=daniel@disko.egmont-kol.dk] has joined #bzr [08:04] phanatic: hi [08:05] hey schierbeck [08:05] i've just rolled out 0.91.0 [08:05] cool [08:06] have you taken a look at the remove-date-column branch? === jamesh_ [n=james@canonical/launchpad/jamesh] has joined #bzr [08:08] phanatic: cool, thanks === pmezard [n=pmezard@nor75-4-81-56-59-92.fbx.proxad.net] has joined #bzr === jrydberg__ [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr [08:10] schierbeck: yep, but i think we should go with what GaryvdM suggested (allowing the user the select which columns s/he wants to see) === grimboy [n=grimboy@85-211-248-46.dsl.pipex.com] has joined #bzr [08:11] dato: yw :) [08:12] phanatic: okay, is someone working on that atm? [08:12] i don't know if GaryvdM does, i hope he can answer that when he returns [08:15] okay, i was just hoping we could've merged my branch first, and then worked on a more advanced solution later on [08:16] phanatic, congrats on your first release (-: [08:17] phanatic: should i create a separate branch for the removal of the email part of the committer column? [08:17] jelmer: thanks :) i hope i haven't f'd up anything... === Lo-lan-do spots jelmer [08:17] Aha! [08:17] schierbeck: it's up to you [08:18] hey Lo-lan-do [08:18] jelmer: I'm sorry I was not online during the weekend, hope you weren't waiting for me [08:18] phanatic: okay, i'll do that -- you'll merge it to trunk? === jelmer [n=jelmer@132.207.221.82] has joined #bzr [08:19] hey Lo-lan-do [08:19] schierbeck: sure, just send a mail about that to the list, so we can track them. and don't forget the NEWS entry. i had to hunt down at least 5 missing items before the release :) [08:19] bad timing for a client crash :-) [08:19] As I was saying: jelmer: I'm sorry I was not online during the weekend, hope you weren't waiting for me [08:20] (Hope you're not fleeing away from me :-) [08:21] New bug: #144522 in bzr "test suite fails" [Undecided,Fix committed] https://launchpad.net/bugs/144522 [08:21] Nah, was travelling [08:23] 'kay. Did you have time to have a look at my pushing problem? [08:23] phanatic: btw, do you want me to sign the commits? [08:27] Lo-lan-do: working on it atm [08:27] That's great! [08:31] schierbeck: it's not neccessary === jrydberg [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr [08:32] phanatic: screw it, i already did it [08:32] :) [08:32] hehe :) [08:32] no problem [08:32] i hope it won't break anything === bwinton [n=bwinton@mail.phantomfiber.com] has left #bzr [] [08:32] jelmer: could you update gnomefiles and freshmeat? i don't have access to those bzr-gtk pages [08:33] phanatic: i'm thinking of adding some ui for displaying whether a commit has been signed, so i'm planting some data [08:33] phanatic, I'll add you to the list of maintainers of both [08:33] jelmer: thanks! [08:33] schierbeck: sounds cool :) [08:33] okay, i've got to get something to eat now, see you guys later [08:35] abentley: When you're around I have some trac-bzr patches. [08:37] phanatic, schierbeck: Hi [08:37] I'm not working on the columns selector currently. [08:37] GaryvdM: hey, thanks for the update [08:37] phanatic: I've added you on freshmeat === Mez_ [n=Mez@ubuntu/member/mez] has joined #bzr [08:37] How is the release going? === kiko [n=kiko@canonical/launchpad/pdpc.supporter.active.kiko] has joined #bzr [08:39] phanatic, and you're now owner of bzr-gtk on gnomefiles.org [08:40] GaryvdM: 0.91.0 is out :) [08:40] jelmer: thank, updating those sites now... [08:40] thanks [08:40] Cool! [08:48] jelmer: freshmeat and gnomefiles updated [08:48] oooh, jelmer, my favourite bzr-svn maintainer [08:49] schierbeck: subscribe to the list :P === cprov [n=cprov@canonical/launchpad/cprov] has joined #bzr [08:56] hey lapthrick [08:56] phanatic, thanks! [08:57] jelmer: did you have the time for bugfixing love perhaps? === Mez [n=Mez@ubuntu/member/mez] has joined #bzr [09:00] lapthrick, I'm working on bzr-svn atm though on a different bug.. [09:00] I see === herzel [i=herzel@gateway/tor/x-460c31d9e3cb0b91] has joined #bzr === dewd [n=dewd@201009147182.user.veloxzone.com.br] has joined #bzr [09:08] Lo-lan-do: can you try the pushing again [09:08] ? [09:09] Sure [09:13] http://paste.debian.net/37896 === jamesh_ [n=james@canonical/launchpad/jamesh] has joined #bzr === grimeboy [n=grimboy@85.211.241.150] has joined #bzr === Mez [n=Mez@ubuntu/member/mez] has joined #bzr [09:27] abadger1999: the warning is out of date, I believe it is less scary in bzr.dev [09:28] lifeless: Great. [09:28] dose anyone have a bzr RPM for RHEL4 ? [09:30] corporate_cookie: I'm not sure, however its really easy to run from source - just unpack it somewhere and add the dir to your path [09:30] corporate_cookie: as long as you have pythn2.4 or newer, the very core will simply work [09:30] lifeless: I need an entry in my RPM database for some dependancy checking === duckx [n=Duck@tox.dyndns.org] has joined #bzr [09:31] I've tried to roll my own ..but i'm getting some fun errors ...and I have no clue what they mean [09:31] corporate_cookie: oh [09:31] corporate_cookie: Which python version is in RHEL4? [09:31] corporate_cookie: what sort of errors, ones from rpm ? [09:33] corporate_cookie: python -c 'import sys; print sys.version' [09:34] I was pretty sure it was 2.3 :-( [09:34] Lo-lan-do: thanks [09:34] abadger1999: its 2.3 [09:34] however ..i have a parallel install of 2.4 [09:36] corporate_cookie: Ah. Then I might be able to help (I build the Fedora and EPEL-5 bzr rpms) [09:36] corporate_cookie: if you pastebin your errors and spec file I can take a look. [09:41] phanatic: i thought i already was :) i've done it now [09:41] schierbeck: thanks. your previous mail will appear on the list as soon as we get moderation fixed :) [09:42] phanatic: cool [09:44] abadger1999: (managers always pick the best times to stop by and check in; pardon my slow responce) [09:46] abadger1999: im generating the spec ..and rpm with python2.4 setup.py bdist_rpm [09:48] corporate_cookie: k. [09:48] im pasting the full output [09:48] http://pastebin.com/d37383707 [09:51] Hmm... it's unable to find generate_docs.py even though it's in the toplevel directory. [09:55] abadger1999: is this a problem with the python install ? [09:56] corporate_cookie: I don't think so. I'm able to replicate it here with the vendor py2.5 install. === Lo-lan-do starts hacking his DSL gateway [09:59] I'll probably blink for a while, but I'll definitely be back :-) === grimeboy [n=grimboy@85-211-244-198.dsl.pipex.com] has joined #bzr [10:00] corporate_cookie: Looks like it's a problem with distutils. [10:00] Lo-lan-do: good luck :) === bac_afk is now known as bac === jamesh_ [n=james@canonical/launchpad/jamesh] has joined #bzr [10:01] corporate_cookie: Let me see if I can get an old enough version of the bzr spec from Fedora that might work for you. [10:01] thanks : ) [10:02] New bug: #144300 in bzr "bzr log dies on more fancy revisionspecs with bzr-svn branches" [Medium,Triaged] https://launchpad.net/bugs/144300 === juliank [n=juliank@f049170213.adsl.alicedsl.de] has joined #bzr [10:09] Back (yay for TCP timeouts being longer than the reboot time of a Soekris box) [10:09] corporate_cookie: http://toshio.fedorapeople.org/bzr.spec [10:09] woo hoo [10:09] thanks abadger1999 [10:09] bubg 144300 [10:09] corporate_cookie: Have you built an rpm from scratch before? [10:09] bug 144300 [10:09] Launchpad bug 144300 in bzr-svn "bzr log dies on more fancy revisionspecs with bzr-svn branches" [Medium,Triaged] https://launchpad.net/bugs/144300 [10:10] looks like the ancestor: one is a bzr-svn related bug [10:10] abadger1999: I have ...but i must admit i've only done it aa few times [10:10] lifeless: but the branch: one is valid for bzr itself too [10:10] yah noticing that [10:11] corporate_cookie: Okay. If you have troubles using rpmbuild with that spec let me know and I'll try to work out what's going wrong. [10:11] corporate_cookie: I don't have a rhel 4 box with python2.4 so I can't test it easily :-( [10:11] That kinda ties in with but 144421 I filed earlier. [10:11] lifeless: There's no "split" option for bugs in lp yet, right? I'll make a copy [10:12] bug 144300 [10:12] Launchpad bug 144300 in bzr "bzr log -r branch|ancestor attempt to fetch data in a read only transaction" [High,Triaged] https://launchpad.net/bugs/144300 [10:13] Note that my testing was on stat, which fails with branch:. Using 'diff' instead works, though. === ipkiss [i=ipkiss@nat/ecp/x-21648748d30e93c8] has joined #bzr === BasicOSX [n=BasicOSX@errant.real-time.com] has joined #bzr [10:15] another patch up :) [10:16] so jelmer, I'm curious why the new list [10:17] http://pastebin.ca/709607 [10:17] shouldn't both report no such command? [10:18] bzr should handle utf8 everywhere IMO [10:18] lifeless: doesn't require contributors to be on the high-volume bzr list, makes it easier to set up separate bundlebuggy, doesn't clutter the main list with bzr-gtk merge requests === hsn_ [n=radim@234.114.broadband5.iol.cz] has joined #bzr [10:18] AnMaster: Are you using a UTF-8 locale? [10:18] fullermd, I am [10:19] jelmer: OTOH if most of our users use bzr-gtk as well, then until they get used to the other list your contributors won't see their questions [10:19] sv_SE.UTF8 [10:19] also slack folk like me with $ too many lists, will be lazy about joining the new list [10:19] sv_SE.UTF-8 even [10:19] AnMaster: It DTRT's for me. en_US.UTF-8. [10:20] bzr 0.90 [10:20] lifeless: There'll still be bzr-gtk folks like Szilveszter and me around to help with the occasional question on the main bzr list [10:20] bzr.dev and 0.91rc2. I don't have 0.90 handy at the mom... wait, maybe I do. [10:20] Yeah, works on 0.90 too. [10:20] fullermd, system is freebsd [10:21] So're all mine. I've got taste, after all ;> [10:21] it also fails on gentoo [10:21] hm [10:21] it fails on my 64-bit gentoo but not my 32-bit gentoo [10:21] as for freebsd, it is 32-bit [10:21] weird [10:22] Are you setting LANG, or some of the LC_*'s individually? [10:22] fullermd, I'm setting LC_ALL [10:22] LANG is set to C [10:22] but, it is same on each [10:22] fullermd, actually no it isn't [10:23] lifeless: also, two bundlebuggy's on one list doesn't work - at least not with the standard bundlebuggy and standard 'bzr send' [10:23] fullermd, but well both gentoo got LC_COLLATE set to C as well [10:23] and one of those worked [10:23] so makes no sense [10:23] I've never tried mixing and matching. I just have LANG=en_US.UTF-8 on my systems, LC_ALL stays blank, and the other LC_*'s follow it. [10:24] I get a headache every time I try to figure out more intricate setups and precedence :| [10:24] fullermd heh [10:26]