hsn_ | yes. in checkouts it works like in svn. in branches it doesnt | 12:03 |
---|---|---|
Peng | Right. | 12:04 |
Peng | In branches, you use 'bzr pull'. | 12:04 |
=== LarstiQ [n=larstiq@cust.7.157.adsl.cistron.nl] has joined #bzr | ||
=== meuh [n=meuh@pdpc/supporter/active/meuh] has joined #bzr | ||
=== james_w [i=jw2328@jameswestby.net] has joined #bzr | ||
=== jeremyb [n=jeremy@unaffiliated/jeremyb] has joined #bzr | ||
=== n2diy [n=darryl@wlk-barre-208-103-148-45.dynamic-dialup.coretel.net] has joined #bzr | ||
=== lifeless [n=robertc@ppp245-86.static.internode.on.net] has joined #bzr | ||
=== jrydberg [n=johan@213.115.45.46] has joined #bzr | ||
=== alla [n=alla@soy.cyber.com.au] has joined #bzr | ||
=== the_angry_angel [n=karl@sulphur.theangryangel.co.uk] has joined #bzr | ||
=== Odd_Bloke [n=oddbloke@compsoc.sunion.warwick.ac.uk] has joined #bzr | ||
=== Alien_Freak [n=sam@adsl-69-209-211-93.dsl.chcgil.ameritech.net] has joined #bzr | ||
=== joejaxx [i=joejaxx@fluxbuntu/founder/joejaxx] has joined #bzr | ||
=== pete__c [n=pete@032-437-364.area7.spcsdns.net] has joined #bzr | ||
=== mthaddon [n=mthaddon@canonical/launchpad/mthaddon] has joined #bzr | ||
=== herzel104 [i=herzel@gateway/tor/x-3b4978b55113563b] has joined #bzr | ||
=== beuno [n=beuno@ubuntu/member/beuno] has joined #bzr | ||
=== Peng [n=mnordhof@fl-69-69-146-1.dyn.embarqhsd.net] has joined #bzr | ||
=== jkakar [n=jkakar@204-174-36-45.dhcp802.dsl.ucc-net.ca] has joined #bzr | ||
=== Vernius_ [n=tomger@p508ADCD6.dip.t-dialin.net] has joined #bzr | ||
=== uws [n=mathilda@213.207.93.150] has joined #bzr | ||
=== welterde [n=welterde@gandalf.srv.welterde.de] has joined #bzr | ||
=== NfNitLoop [i=codyc@cpe-70-112-28-217.austin.res.rr.com] has joined #bzr | ||
=== statik [n=emurphy@canonical/launchpad/statik] has joined #bzr | ||
=== dfc [i=foobar@8e.d8.3845.static.theplanet.com] has joined #bzr | ||
=== AnMaster [n=AnMaster@unaffiliated/anmaster] has joined #bzr | ||
=== cprov-out [n=cprov@189.7.82.251] has joined #bzr | ||
=== CardinalFang [n=c@user-0c6ti96.cable.mindspring.com] has joined #bzr | ||
=== mwhudson [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr | ||
=== abentley [n=abentley@bas8-toronto63-1088754407.dsl.bell.ca] has joined #bzr | ||
=== asak [n=alexis@201-13-31-123.dsl.telesp.net.br] has joined #bzr | ||
=== abadger1999 [n=abadger1@65.78.187.68] has joined #bzr | ||
=== hmeland [i=29578@klodrik.uio.no] has joined #bzr | ||
=== tsuno [n=michael@ninthorder.com] has joined #bzr | ||
=== dirker [n=dirker@woosome.net] has joined #bzr | ||
=== fullermd [n=fullermd@adsl-072-148-013-213.sip.jan.bellsouth.net] has joined #bzr | ||
=== BjornT_ [n=bjorn@ip-213-190-55-148.static.b4net.lt] has joined #bzr | ||
=== mlh [n=mlh@c211-30-211-232.belrs1.nsw.optusnet.com.au] has joined #bzr | ||
=== ubotu [n=ubotu@ubuntu/bot/ubotu] has joined #bzr | ||
=== elmo [n=james@83-216-156-21.jamest747.adsl.metronet.co.uk] has joined #bzr | ||
=== _logger_ [n=_logger@adsl-75-51-62-134.dsl.chcgil.sbcglobal.net] has joined #bzr | ||
=== radix [n=radix@70.91.133.157] has joined #bzr | ||
=== grimboy [n=grimboy@85-211-255-243.dsl.pipex.com] has joined #bzr | ||
=== bratsche [n=cody@adsl-68-94-23-66.dsl.rcsntx.swbell.net] has joined #bzr | ||
=== keir [n=keir@76-10-155-123.dsl.teksavvy.com] has joined #bzr | ||
=== nir [n=nir@moinmoin/fan/nir] has joined #bzr | ||
=== quicksilver [n=jules@212.69.38.59] has joined #bzr | ||
=== weigon [n=jan@pD9E2BC90.dip.t-dialin.net] has joined #bzr | ||
=== fredp_ [n=fred@213.219.162.65.adsl.dyn.edpnet.net] has joined #bzr | ||
=== bigdog_ [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr | ||
=== duckx [n=Duck@tox.dyndns.org] has joined #bzr | ||
=== fbond [n=fab@pool-71-169-154-64.burl.east.verizon.net] has joined #bzr | ||
=== luks [n=lukas@unaffiliated/luks] has joined #bzr | ||
=== vila [n=vila@lec67-4-82-230-53-244.fbx.proxad.net] has joined #bzr | ||
=== taaz [n=dlehn@66.37.66.32] has joined #bzr | ||
=== Mez [n=mez@ubuntu/member/mez] has joined #bzr | ||
=== erikgz [n=erik@128.103.64.68] has joined #bzr | ||
=== dato [n=adeodato@debian/developer/adeodato] has joined #bzr | ||
=== sevrin [n=sevrin@ns1.clipsalportal.com] has joined #bzr | ||
=== siretart [i=siretart@ubuntu/member/siretart] has joined #bzr | ||
=== Ng [n=cmsj@mairukipa.tenshu.net] has joined #bzr | ||
=== sii [n=sii@tranquillity.sii.se] has joined #bzr | ||
=== thatch [n=thatch@pool-71-96-248-177.dfw.dsl-w.verizon.net] has joined #bzr | ||
=== cory_ [i=cory@zeus.penguinhosting.net] has joined #bzr | ||
=== metze [n=metze@ip-217-172-181-76.mx-netz.de] has joined #bzr | ||
=== spiv [n=andrew@canonical/launchpad/spiv] has joined #bzr | ||
=== mneptok [n=mneptok@canonical/support/mneptok] has joined #bzr | ||
=== SteveA [n=steve@canonical/launchpad/SteveA] has joined #bzr | ||
=== [PUPPETS] Gonzo [i=gonzo@80.69.47.16] has joined #bzr | ||
=== _logger [n=_logger@adsl-75-51-62-134.dsl.chcgil.sbcglobal.net] has joined #bzr | ||
lifeless | actually it does the same thing in branches as svn up in a branch | 01:08 |
lifeless | that is, nothing :) | 01:08 |
lifeless | (well, takes your tree up to the state of the branch) | 01:08 |
keir | what's the status of nested trees? right now i'm symlinking one project into another, but that's not too optimal! | 01:29 |
keir | lifeless, is bzr going to support repositories > 4gb on 32 bit machines? | 01:31 |
keir | right now packs won't scale like that | 01:31 |
keir | at least, i don't think they will because repack requires fitting everything in memory | 01:31 |
=== kjcole_ [n=kjcole@pchb1f.gallaudet.edu] has joined #bzr | ||
hsn_ | #151968 | 01:42 |
hsn_ | ubotu: 151968 | 01:42 |
ubotu | Sorry, I don't know anything about 151968 - try searching on http://ubotu.ubuntu-nl.org/factoids.cgi | 01:42 |
=== jelmer_ [n=jelmer@157pc196.sshunet.nl] has joined #bzr | ||
=== jelmer_ is now known as jelmer | ||
=== p4tux [n=p4tux@189.169.95.23] has joined #bzr | ||
=== asak [n=alexis@201-13-31-195.dsl.telesp.net.br] has joined #bzr | ||
=== NamNguyen [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr | ||
=== NamNT_ [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr | ||
=== thumper [n=tim@canonical/launchpad/thumper] has joined #bzr | ||
=== NamNT__ [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr | ||
=== poolfool [n=mchaffin@c-71-196-179-226.hsd1.co.comcast.net] has joined #bzr | ||
=== weigon_ [n=jan@pD9E2859B.dip.t-dialin.net] has joined #bzr | ||
=== keir [n=keir@206-248-130-132.dsl.teksavvy.com] has joined #bzr | ||
=== AfC [i=andrew@office.syd.operationaldynamics.com] has joined #bzr | ||
=== orospakr [n=orospakr@bas4-ottawa23-1177561139.dsl.bell.ca] has joined #bzr | ||
=== BasicOSX [n=BasicOSX@216.243.156.81] has joined #bzr | ||
=== Basic [n=Basic@216.243.156.81] has joined #bzr | ||
=== BasicMac [n=BasicOSX@warden.real-time.com] has joined #bzr | ||
=== poolfool [n=mchaffin@c-71-196-179-226.hsd1.co.comcast.net] has left #bzr [] | ||
=== mneptok [n=mneptok@canonical/support/mneptok] has joined #bzr | ||
=== fog [n=fog@debian/developer/fog] has joined #bzr | ||
=== pbor [n=urk@host27-19-dynamic.60-82-r.retail.telecomitalia.it] has joined #bzr | ||
=== mwhudson_ [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr | ||
=== jml_ [n=jml@virgin19.lnk.telstra.net] has joined #bzr | ||
=== keir [n=keir@206-248-132-111.dsl.teksavvy.com] has joined #bzr | ||
=== fredp [n=fred@213.219.152.242.adsl.dyn.edpnet.net] has joined #bzr | ||
=== nir [n=nir@moinmoin/fan/nir] has joined #bzr | ||
lifeless | keir: repack doesn't buffer everything in ram | 12:01 |
lifeless | keir: it buffers a single knit record at a time + the source and target indices | 12:02 |
=== lifeless waves | ||
=== phanatic [n=phanatic@gw.bercsenyikoll-bp.sulinet.hu] has joined #bzr | ||
=== keir_ [n=keir@76-10-152-206.dsl.teksavvy.com] has joined #bzr | ||
=== Mez is now known as Mez|Away | ||
=== beuno [n=beuno@44-111-231-201.fibertel.com.ar] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== phanatic [n=phanatic@gw.bercsenyikoll-bp.sulinet.hu] has joined #bzr | ||
=== grimboy [n=grimboy@85-211-255-243.dsl.pipex.com] has joined #bzr | ||
=== Mez|Away is now known as Mez | ||
=== Mez is now known as Mez|Away | ||
=== kaaloo [n=luis@rue92-3-82-232-48-241.fbx.proxad.net] has joined #bzr | ||
=== Daviey [n=dave@ubuntu/member/daviey] has joined #bzr | ||
Daviey | Hey, has anybody got a suggestion on how to auto email commits(+comments) to certain addresses? | 01:22 |
Daviey | (non LP bzr) | 01:22 |
luks | depends on what do you mean by "auto" | 01:23 |
Daviey | luks: this - https://edge.launchpad.net/bzr-email :) | 01:24 |
Daviey | Hmm.. but that is client side... I really wanted the branch to do it :/ | 01:26 |
Daviey | (server side) | 01:26 |
luks | oh, you meant sending mails to e.g. commits mailing list | 01:27 |
Daviey | yeah.. but rather than a ML a list of addresses | 01:28 |
luks | I haven't tried, but what about https://edge.launchpad.net/bzr-hookless-email/ | 01:28 |
Daviey | thats the one :) | 01:29 |
Daviey | thanks | 01:29 |
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== mwhudson_ [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr | ||
=== fog [n=fog@debian/developer/fog] has left #bzr [] | ||
=== Kamping_Kaiser [n=kgoetz@gnewsense/friend/kgoetz] has joined #bzr | ||
Kamping_Kaiser | should bzr automatically update the default `bzr pull` location when you do a pull from a different server? | 01:54 |
Odd_Bloke | Kamping_Kaiser: No, you need to pass --remember for it to do so. | 01:55 |
Kamping_Kaiser | Odd_Bloke, oh. cheers. | 01:56 |
Odd_Bloke | Kamping_Kaiser: :) | 01:56 |
Kamping_Kaiser | :) | 01:56 |
=== Kamping_Kaiser notices from survey that bzr supports bzr+ssh | ||
=== pbor [n=urk@host161-21-dynamic.60-82-r.retail.telecomitalia.it] has joined #bzr | ||
=== BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== mwhudson [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== NamNguyen [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr | ||
=== BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== hackter [n=dboucard@mna75-6-82-229-33-118.fbx.proxad.net] has joined #bzr | ||
=== phanatic [n=phanatic@dsl5400C417.pool.t-online.hu] has joined #bzr | ||
=== BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr | ||
=== keir_ is now known as keir | ||
=== Basic [n=Basic@216.243.156.81] has joined #bzr | ||
=== bialix [i=chatzill@77.109.22.21] has joined #bzr | ||
bialix | luks: ping? | 05:02 |
luks | bialix: pong | 05:05 |
bialix | hi luks | 05:05 |
luks | hi | 05:05 |
bialix | something really weird wit qannotate | 05:05 |
bialix | with | 05:05 |
bialix | and this is not my fault | 05:05 |
bialix | try to qann bzrlib/merge3.py | 05:05 |
luks | what's the problem? | 05:06 |
bialix | it throw away series of lines | 05:07 |
bialix | especially: class Merge3 ... it's simply missing in qann window | 05:08 |
bialix | say me it's not win32-related | 05:08 |
luks | hm, not in mine | 05:09 |
bialix | screenshot: http://bialix.com/qbzr/qann-merge3.png | 05:12 |
bialix | does not matter: with my latest encoding support or before it | 05:12 |
luks | sorry, I'm back (stupid wifi was disconnecting me) | 05:17 |
luks | yes, I see it too on windows | 05:17 |
luks | no idea what could be causing it | 05:17 |
bialix | IMO it's < sign | 05:18 |
luks | hm, it depends on whether Pygments is installed | 05:18 |
bialix | line 39 | 05:18 |
bialix | I'm running standalone bzr.exe | 05:18 |
bialix | so no Pygments here | 05:19 |
bialix | may be we should escape < sign? | 05:19 |
luks | uhh, right, it doesn't escape html at all | 05:19 |
luks | so &, < and > need to be changed to xml entities | 05:20 |
bialix | i think so | 05:20 |
bialix | htmlize from util.py is enough? | 05:20 |
luks | htmlize creates also links | 05:21 |
luks | not sure if that's a good idea in code | 05:21 |
bialix | cgi.escape? | 05:21 |
luks | but maybe yes | 05:21 |
luks | I'd prefer to not use the cgi module | 05:21 |
bialix | ok | 05:21 |
luks | diffview.htmlencode | 05:22 |
luks | should be moved to util | 05:22 |
bialix | I see | 05:22 |
bialix | want me to do this? | 05:23 |
luks | I'll do it | 05:24 |
bialix | ok, thanks | 05:24 |
bialix | luks, do you know how to plug-in new merge algorithm? | 05:24 |
luks | nope | 05:24 |
bialix | merge3 is wtf for me time to time | 05:25 |
=== BasicOSX [n=BasicOSX@warden.real-time.com] has joined #bzr | ||
=== Basic [n=Basic@216.243.156.81] has joined #bzr | ||
=== khayashi [n=khayashi@i121-117-66-122.s04.a013.ap.plala.or.jp] has joined #bzr | ||
=== grimeboy [n=grimboy@85-211-244-1.dsl.pipex.com] has joined #bzr | ||
=== g0ph3r [n=g0ph3r@p57A086AC.dip0.t-ipconnect.de] has joined #bzr | ||
ubotu | New bug: #152360 in bzr "AssertionError: empty revision for the inv_entry TREE_ROOT when doing "bzr branch -r 1 bzr.dev foo"" [Critical,Confirmed] https://launchpad.net/bugs/152360 | 05:50 |
=== grimeboy [n=grimboy@85-211-254-191.dsl.pipex.com] has joined #bzr | ||
=== kaaloo [n=luis@rue92-3-82-232-48-241.fbx.proxad.net] has joined #bzr | ||
=== khayashi [n=khayashi@i121-117-66-122.s04.a013.ap.plala.or.jp] has left #bzr [] | ||
=== Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr | ||
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr | ||
=== abentle1 [n=abentley@65.93.219.20] has joined #bzr | ||
=== asak [n=alexis@201-13-25-191.dsl.telesp.net.br] has joined #bzr | ||
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== grimeboy [n=grimboy@85-211-246-212.dsl.pipex.com] has joined #bzr | ||
=== Vernius [n=tomger@p508AFF6A.dip.t-dialin.net] has joined #bzr | ||
=== beuno [i=root@ubuntu/member/beuno] has joined #bzr | ||
=== poolfool [n=mchaffin@c-71-196-179-226.hsd1.co.comcast.net] has joined #bzr | ||
=== BasicOSX [n=BasicOSX@c-24-118-19-60.hsd1.mn.comcast.net] has joined #bzr | ||
=== Mez|Away is now known as Mez | ||
=== grimboy_uk [n=grimboy@85-211-246-190.dsl.pipex.com] has joined #bzr | ||
=== cfbolz [n=cfbolz@p54AB8615.dip0.t-ipconnect.de] has joined #bzr | ||
=== BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr | ||
=== bialix_ [i=chatzill@77.109.21.61] has joined #bzr | ||
=== jamesh_ [n=james@canonical/launchpad/jamesh] has joined #bzr | ||
=== schierbeck [n=daniel@dasch.egmont-kol.dk] has joined #bzr | ||
=== cfbolz [n=cfbolz@p54AB8615.dip0.t-ipconnect.de] has joined #bzr | ||
=== nilton [n=nilton@201.82.47.140] has joined #bzr | ||
=== n2diy [n=darryl@wlk-barre-208-103-148-45.dynamic-dialup.coretel.net] has joined #bzr | ||
nilton | hi. how can i setup a bazaar server over https with apache? | 10:47 |
nilton | or how is the best way to setup a bazaar server? | 10:49 |
=== grimeboy [n=grimboy@85-211-251-126.dsl.pipex.com] has joined #bzr | ||
nilton | can anyone give some tips on setting up a bazaar server? | 11:09 |
nilton | I'm reading the docs but I don't think I see how to do it... | 11:11 |
keir | nilton, you don't need a server | 11:12 |
keir | http will do | 11:12 |
keir | or if you have ssh access, do bzr+ssh:// | 11:12 |
nilton | keir: i would like to do it over http... | 11:15 |
nilton | but i need to setup dav and use a bzr plugin, so i can write to it, right? | 11:15 |
=== thumper is now known as thumper-office | ||
=== thumper [n=tim@canonical/launchpad/thumper] has joined #bzr | ||
keir | nilton, yes. i don't know anything about DAV :( | 11:22 |
nilton | do most bazaar projects use bzr+ssh protocol? because for svn projects dav over http is the default choice... | 11:24 |
Peng | Actually, I'd say most use sftp. | 11:29 |
=== jelmer always uses bzr+ssh | ||
=== thumper-office [n=tim@canonical/launchpad/thumper] has joined #bzr | ||
Peng | Yeah. | 11:41 |
Peng | I meant to add that bzr+ssh is replacing sftp. | 11:41 |
AfC | nilton: you can configure things so that http:// requests are internally forwarded to a bzr smart server (though I personally have never made this work). We just run a Bazaar daemon to serve bzr:// now for reads, and the few people with write access push via bzr+ssh:// | 11:43 |
Peng | You've never made forwarding work, or never made bzr+http work? | 11:44 |
nilton | AfC: I've read something about that on http://doc.bazaar-vcs.org/latest/en/user-guide/server.html | 11:47 |
nilton | but i didn't see anything about forwarding http to a bzr server... the docs seems somewhat scaterred.. | 11:49 |
=== Alien_Freak [n=sfaci2@vpn82-7e-92-3.near.uiuc.edu] has joined #bzr |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!