/srv/irclogs.ubuntu.com/2007/10/09/#bzr.txt

=== jml is now known as jml-laptop
=== mwhudson [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr
=== jml [n=jml@li2-200.members.linode.com] has joined #bzr
=== marianom [n=marianom@ubuntu/member/marianom] has left #bzr []
=== jamesh_ [n=james@222-155-39-225.jetstream.xtra.co.nz] has joined #bzr
=== jml [n=jml@li2-200.members.linode.com] has joined #bzr
=== mvo [n=egon@p54A67CC8.dip.t-dialin.net] has joined #bzr
=== jml-laptop [n=jml@222-155-39-225.jetstream.xtra.co.nz] has joined #bzr
=== jml_ [n=jml@222-155-39-225.jetstream.xtra.co.nz] has joined #bzr
=== n2diy_ [n=darryl@wlk-barre-208-103-147-251.dynamic-dialup.coretel.net] has joined #bzr
=== jml_ [n=jml@222-155-39-225.jetstream.xtra.co.nz] has joined #bzr
=== thumper_laptop [n=tim@222-155-39-225.jetstream.xtra.co.nz] has joined #bzr
=== thumper_laptop is now known as thumper
=== mvo [n=egon@p54A67CC8.dip.t-dialin.net] has joined #bzr
=== thumper_laptop [n=tim@canonical/launchpad/thumper] has joined #bzr
=== jml__ [n=jml@222-155-55-67.jetstream.xtra.co.nz] has joined #bzr
=== mwhudson [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr
=== thumper_dodgy_co [n=tim@222.153.133.138] has joined #bzr
=== thumper_dodgy_co is now known as thumper
=== jamesh__ [n=james@canonical/launchpad/jamesh] has joined #bzr
=== jamesh__ is now known as jamesh
lifelessabentley: hi. I would like to still see the branch nickname from the bundle, in BB. is that possible/easy?01:16
abentleylifeless: I think so.01:17
abentleyThis would have to be the head revision branch nick.01:17
lifelesshmm maybe it wasn't the nick. There was a field in the bundle header I used to read when you showed the bundle01:20
=== poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr
=== BasicOSX [n=BasicOSX@warden.real-time.com] has joined #bzr
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== igc [n=igc@ppp121-45-195-124.lns1.bne1.internode.on.net] has joined #bzr
igcmorning01:36
=== tetron [i=tetron@c-24-91-136-46.hsd1.ma.comcast.net] has joined #bzr
tetronquick Q, is there an easy way in bzr to have it embed the current repository revision to a file?01:41
tetroni.e. so an "about" dialog has the current build rev01:41
fullermdNot automatically, via keyword expansion.01:41
fullermdYou can do it manually via sed'ery.  Depending on language, you can use the version-info command to generate a source file containing it.01:42
tetronfullermd: great, thanks01:48
poolfoolUm ... does bzr support any type of keyword expansion (ala CVS)?01:50
fullermdNyet.01:50
poolfoolOk ... is that on the roadmap to 1.0 land?01:51
fullermdDon't think so...   that path is pretty full of performance and suchlike.  It's post-1.0.01:51
poolfoolThanks.01:51
poolfoolOr what is thanks in Russian?01:52
fullermdUrg.  Now you're straining my knowledge of the language   :p01:52
fullermdSpasibo?01:52
=== poolfool [n=poolfool@techsat21.itnes.com] has left #bzr []
=== BasicOSX [n=BasicOSX@warden.real-time.com] has joined #bzr
=== i386 [n=jdumay@202.47.1.18] has joined #bzr
abentleylifeless: perhaps you're thinking of the branch's public location?  that is already shown.03:01
=== abentley [n=abentley@bas8-toronto63-1088754407.dsl.bell.ca] has joined #bzr
=== orospakr_ [n=orospakr@bas4-ottawa23-1177650137.dsl.bell.ca] has joined #bzr
=== igc [n=igc@ppp121-45-195-124.lns1.bne1.internode.on.net] has left #bzr []
lifelessabentley: could be03:31
lifelessabentley: hey, got time to chat about merge base?03:31
abentleyI'm not feeling well.03:33
=== bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr
=== BasicOSX [n=BasicOSX@216.243.156.81] has joined #bzr
=== BasicMac [n=BasicOSX@warden.real-time.com] has joined #bzr
lifelessabentley: oh, thats a shame. Get well soon.03:41
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
lifelessabentley: I feel that we have a regression on merge base selection, and I'd be happy to fix it if we can chat about it at some point.03:41
=== pete__c [n=pete@015-850-358.area5.spcsdns.net] has joined #bzr
=== poolie [n=mbp@ppp112-44.static.internode.on.net] has joined #bzr
pooliespiv, hi04:03
spivpoolie: Hello04:03
spivlifeless: have you looked at my reconcile patch from Friday?04:06
lifelessspiv: no I haven't, thanks for reminding me04:08
lifelessI will be pairing with poolie much of today04:08
=== poolfool [n=mchaffin@c-71-196-179-226.hsd1.co.comcast.net] has joined #bzr
lifelesshi poolfool, welcome back :)04:10
pooliespiv, i was thinking about the default port number thing04:10
lifelessvila: hola04:10
poolfoolThanks ... How is life?04:10
lifelessvila: what is transportstats?04:11
lifelesspoolfool: good :)04:11
poolfoolpoolie: Hey, I sent you an email earlier today (chaffinMichael@gmail) about the redhat SPEC file ... hope it helps.04:12
spivpoolie: did you come to any conclusions?04:13
=== yminsky [n=yminsky@user-0cevcqv.cable.mindspring.com] has joined #bzr
bigdogI have a question for you guys,  I have some use cases, and am not sure if bzr would work.04:45
bigdogI have binary files 100meg-1gb04:46
lifelessfood time04:46
lifelessbut yes, bzr will work, ifyou have enough ram04:47
bigdoglifeless: happy eating04:47
beunobigdog, I use bzr to keep track of big files, one thing to keep in mind, bzr needs to put everything in memory04:47
lifelesswe're starting to address teh amount of ram needed.04:47
beunoso 1gb file means at least 2gb available  :D04:47
bigdogok, I did not realize the files needed to be in memory, just the history info.04:47
beunolifeless, my gfx guys will be happy to hear they can start wasting space again on 1gb files  :p04:47
bigdogbeuno: these are 3d modeling files04:48
beunobigdog, right, I get my guys to zip 'em up04:48
beunosplit them if needed04:48
beunonot convenient, but works04:48
bigdogguys: thanks for the info05:01
beunobigdog, :D05:03
=== michelp [n=michelp@69-30-72-119.dq1sf.easystreet.com] has joined #bzr
lifelessbigdog: np05:28
lifelessspiv: thanks for the trivia05:45
lifelessspiv: My pointy haired side wonders if it was really worth looking at the python source to find out though ;)05:46
fullermdWha?  Of course it is.  It's like spending $200 to win a $10 bet; you gotta keep your priorities straight.05:50
=== bialix [i=chatzill@77.109.20.212] has joined #bzr
bialixfullermd: I'm impressed06:00
fullermdHmm?06:00
bialixSpasibo is indeed thanks in russian06:01
fullermdOh, good.  My memory still occasionally works   :)06:02
=== bialix impressed by talents of fullermd
pooliemark used "spasibo" the other day and i was wondering what it meant06:04
fullermdOh, don't be _too_ impressed.  I have a Russian vocabulary of maybe a half dozen words, and I'm useless with the alphabet   :p06:04
bialixmark sabdfl?06:04
bialixhe was in Moscow06:04
poolieyes06:05
poolieand Zvyozdny Gorodok06:05
=== bialix knows a guy who meets Mark
fullermdI know only moderately more German, have forgotten much of the French I knew (which was only ever good enough to pidgin-talk my way about at its peak), can count to 6 in Korean and 10 in Spanish...06:06
bialixyes, star town06:06
fullermdLuckily, I'm American, so nobody expects me to handle anything but English anyway   ;>06:06
bialixthat's why I'm impressed (a bit)06:07
=== ED_bomeu [n=edoboemi@201009119139.user.veloxzone.com.br] has joined #bzr
lifelessfullermd: Americans don't speak English though ;)06:07
fullermdlifeless: I speak the King's English.  It was good enough for Elvis, it's good enough for me!06:08
=== ED_bomeu [n=edoboemi@201009119139.user.veloxzone.com.br] has left #bzr []
lifelessfullermd: do you have Blue Suede Shoes ?06:12
fullermdThey're out in my pink Cadillac.06:13
lifelessthen I guess you're good enough for the language06:13
lifeless:)06:14
fullermdI'm glad you think so.  Otherwise, I'd'a had to don a gold lame suit and start hopping around the channel.06:16
fullermdAnd NOBODY wants that...06:16
lifelesshmmm06:16
ubotuNew bug: #150820 in bzr "hashcache is invalidated when a file's containing directory isrenamed" [Wishlist,Confirmed]  https://launchpad.net/bugs/15082006:21
lifelessciaoish, going off net for battery06:23
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== igc [n=igc@ppp121-45-195-124.lns1.bne1.internode.on.net] has joined #bzr
i386lifeless: we should do beer sometime06:42
=== n2diy__ [n=darryl@69.72.85.113] has joined #bzr
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
lifelessi386: definately07:18
vilalifeless: a transport decorator as a plugin that will be published RSN07:19
vilaI wanted to play a bit with some ideas in a sandbox07:20
lifelessvila: cool; have you seen the trace+ decorator ?07:20
vilayup, give me a good laugh :) Looks like we were partly on the same track07:21
lifelessheh07:21
vilathe intents are a bit different though, transportstats collect every transport method call, the analysis being done later07:21
lifelesshmm07:22
vilawell nearly every07:22
lifelesslike get_transport() ?07:22
vilano07:22
vilalike has, get, get_bytes, put_bytes, etc07:22
lifelessso every Transport method call :)07:23
vilawith some exceptions like put_non_atomic_file that are written in terms of other methods07:23
lifelessI'd like to flesh trace+ out07:23
lifelesshmm, I don't think they should be exceptions, because a given transport may choose to implement it natively07:23
vilathe big part was to serialize without being to much a resource hog07:24
=== BjornT [n=bjorn@canonical/launchpad/BjornT] has joined #bzr
vilahonestly, there are some problems, so far I aimed at something simple so that I can display bytes read bytes written latency etc07:24
lifelesssure07:25
lifelesssounds nice07:25
vilaand even for that a simple decorator may not be enough, readv and open_write_stream may need specific implementations to measure latency more correctly or real bytes read too07:26
vilabut I think the serialization part is mostly good so far, I have to profile a bit to see if a C implementation is needed, but the API is quite cool to use :)07:27
vilalet say I want to add a new method 'get_half_file(relpath, start, middle)' all I have to do is add: 'register_stat('Transport.get_half_file', TransportGetHalfFile, "%(relpath)us %(start)L %(middle)L")07:29
vilaand the serialization is taken care of, an TransportGetHalfFile object will be created at deserialization time with attributes (base, relpath, start, middle)07:30
vilaanyway I shouldn't talk that much before coffee, bbl :)07:30
lifelesslol07:34
igctime to complete the gutsy upgrade - bbl07:36
lifelessmay the repo be with you07:37
lifelessare you running on the real hardware yet ?07:37
igcI am on my server and it upgraded ok last night07:37
igcstill running on Parallels on my MacBook07:37
igcI'll try on the raw hardware in the next week or two hopefully07:38
lifelessfor a frozen distro the churn rate is humungous07:39
igcand sadly, my patch to the help explaining how to use bzr got dropped07:41
igcsigh07:42
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
lifelessigc: :(07:45
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
=== Zindar [n=erik@h188n1fls12o803.telia.com] has joined #bzr
ubotuNew bug: #150834 in bzr-pqm "Make STARTTLS and AUTH work better" [Undecided,New]  https://launchpad.net/bugs/15083408:21
poolieigc, which patch?08:21
poolielifeless: back now?08:42
lifelessyes08:43
lifelessmeetings over08:43
pooliein a bit of searching i cannot find a dirstate bug that is fixed by this08:44
lifelessok08:44
pooliewhich i am a bit surprised by08:45
lifelessI would assume it was only erroroneous on the cache side then08:45
=== hdima [n=hdima@idealer.cust.smartspb.net] has joined #bzr
poolieso now i'm trying to decide whether to08:46
poolie0- just put it up to merge08:46
poolie1- run under kcachegrind08:47
poolie2- think harder about what kind of failure that could cause08:47
lifelessI don't think 1 will help08:47
pooliei have confirmed that it's not rereading them08:47
poolieso, yeah, it seems redundant08:47
lifelessI think its passing all tests08:48
lifelessso this is fine in terms of our quality metric08:48
poolieit would have been nice to have closed off additional bugs08:48
poolieok08:48
lifelessit would be nice if you do think of a 'X should break under the old code' to come back to it08:48
lifelessbut I think we're at diminishing terms08:48
lifeless*returns*08:49
poolieagree - just one thing - can you look at _cmp_path_by_dirblock_py and confirm for me that08:49
pooliethe docstring is backwards08:49
pooliewrt negative vs positive08:49
lifelessdo you mean cmp_by_dirs ?08:52
poolieboth of them08:52
pooliethey all have similar docstrings and i think they're all wrong08:53
lifelesswell08:53
lifelessonly one is exposed08:53
lifeless>>> import bzrlib.dirstate08:54
lifeless>>> bzrlib.dirstate.cmp_by_dirs08:54
lifeless<function cmp_by_dirs_py at 0x2b178b89db90>08:54
lifeless>>> bzrlib.dirstate.cmp_by_dirs('foo', 'bar')08:54
lifeless108:54
lifeless>>> bzrlib.dirstate.cmp_by_dirs('bar', 'foo')08:54
lifeless-108:54
lifelessI haven't read the code08:54
=== igc [n=igc@ppp121-45-195-124.lns1.bne1.internode.on.net] has joined #bzr
=== bialix [n=chatzill@77.109.16.182] has joined #bzr
bialixpoolie: are you here?09:00
pooliehi bialix09:01
bialixhi poolie. when next feature freeze planning?09:01
pooliei'm leaving it open for a couple more days to try to land pack changes09:02
pooliei should send mail about that09:03
bialixI'd like to fix bug 129298 for 0.9209:03
ubotuLaunchpad bug 129298 in bzr "Windows standalone installer should create plugins directory" [Low,In progress]  https://launchpad.net/bugs/12929809:03
pooliethat would be good09:03
bialixI'm thinking about providing standalone installers for some plugins, like bzrtools09:04
bialixso this bug is show stopper for me09:04
bialixI think I'll send merge request in next couple of days09:04
pooliek09:10
pooliebialix: maybe there should be just one installer and it should ask you which plugins you want?09:11
bialixpollie: it's possible, but I'm slightly worried about size of all-in-one installer09:11
bialixeven though now I have radiomodem and moderate quality of internet, I'm still remember dial-up days09:12
poolieyes, i see09:12
bialixbzrtools is pretty small though09:12
poolieright09:12
bialixQBzr is bigger (+3MB to installer) because it carries Qt libraries09:13
poolieif bzr-gtk needed to install the gtk libraries that could make it a lot bigger09:13
poolieexactly09:13
bialixyeah, that's why I think QBzr is better choice for win32: it's much smaller09:13
poolieoh, interesting09:13
igcmy leaning is toward one installer. Can we see what size it would be first before taking another path?09:13
bialixok, it's doable09:14
pooliemaybe one big one and one smaller one09:14
=== jamesh [n=james@canonical/launchpad/jamesh] has joined #bzr
bialixI'll do sone experimenting tonight and post result tomorrow09:14
igcthanks09:14
bialixanyway as sane solution, I could provide bare installer (only bzr.exe) and rich installer (with batteries included)09:15
bialixbut I understand that there is already zoo of installers for win3209:15
igcI know it seems a small detail but multiple installers means cross-checking versions match, etc.09:15
igcanything we can do to lower the barrier to entry is very valuable I think09:15
igcand one installer fits into that camp IMHO09:16
=== n2diy__ is now known as n2diy
bialixIMO, rich installer with plugins is the sane answer to hsn_ who 2 days ago complains about bzr is hard to install on windows09:16
bialixbut I'm not planning to include bzr-gtk09:17
bialixI dislike PyGTK bloat09:17
igcsounds like QBzr is shaping up nicely though09:17
poolieit does09:17
poolieit's kind of a shame to have the duplication09:17
bialixwell it lacks QOlive, otherwise it's very good09:17
bialixit's inevitable09:18
bialixLukas did very nice work with side-by-side diff09:18
pooliein Q or G?09:18
bialixQ09:18
bialixbut I'm using bzr-gtk about a year ago, may be they more similar than different09:19
bialixnow09:19
bialixmy point about Q vs G is: Q more windows-alike than G09:20
=== bialix think that Q is first letter from "cool"
=== pbor [n=urk@host102-21-dynamic.60-82-r.retail.telecomitalia.it] has joined #bzr
=== allenap [n=allenap@87-194-166-60.bethere.co.uk] has joined #bzr
=== fog [n=fog@debian/developer/fog] has joined #bzr
=== mvo [n=egon@p54A67164.dip.t-dialin.net] has joined #bzr
=== mwhudson_ [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr
=== mwhudson__ [n=mwh@62-31-157-102.cable.ubr01.azte.blueyonder.co.uk] has joined #bzr
pooliespiv: hi, what's new with hpss?09:46
PengWhat interesting branches are there, for someone useless who just likes reading changelogs?09:48
pooliePeng, https://code.launchpad.net/09:49
PengSure, but there are a lot of them, I don't know what they're all for, and I don't know which ones have been merged into bzr.dev and abandoned.09:50
bialixwhat colors means09:51
bialix?09:51
bialixgreen and blue?09:51
=== cfbolz [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
poolieone is 'uses bzr natively' and one is 'imported from cvs or svn'09:51
pooliePeng, i'm not sure what you're looking for09:52
=== Peng shrugs.
PengInteresting changelogs.09:52
=== mwhudson__ is now known as mwhudson
poolieon bazaar, or something else?09:53
pooliehello mwh_09:53
mwhudsonpoolie: hi09:53
pooliemwhudson, Peng's question is something i'd like code to answer more09:54
poolie'show me some interesting code'09:54
poolieor interesting changes09:54
PengI guess I'm curious what's going on with Bazaar.09:56
pooliehttps://code.edge.launchpad.net/~bzr/bzr/trunk plus http://bundlebuggy.aaronbentley.com/ gives a good picture09:56
bialixumm, packs?09:56
pooliehttp://bundlebuggy.aaronbentley.com/?selected=pending&unreviewed=n http://bundlebuggy.aaronbentley.com/?selected=merged09:56
PengWhat about the hpss stuff?09:57
poolieping spiv09:58
mwhudsonpoolie: there's https://code.edge.launchpad.net/+recently-changed-branches09:59
=== cfbolz [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
=== bac [n=bac@canonical/launchpad/bac] has joined #bzr
vilalifeless: transportstats pushed on launchpad bazaar.launchpad.net/~v-ladeuil/bzr/transportstats10:21
ubotuNew bug: #150860 in bzr "Transports should explicitly track whether a port was specified" [Undecided,New]  https://launchpad.net/bugs/15086010:25
=== mrevell [n=matthew@canonical/launchpad/mrevell] has joined #bzr
=== bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr
=== sverrej [n=sverrej@pat-tdc.opera.com] has joined #bzr
=== cfbolz [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
=== cfbolz_ [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
=== hsn_ [n=chatzill@234.114.broadband5.iol.cz] has joined #bzr
=== cfbolz_ is now known as cfbolz
=== egx0r [n=gx0r@130.225.73.246] has joined #bzr
egx0rI'm using Emacs 23.0.0.x and the bundled vc isn't all that good with bzr. Are you guys aware of any bzr plugins for Emacs or should I just start making my own?11:07
quicksilverDVC11:09
egx0rquicksilver: Thanks! I'll look into it11:11
AnMaster$ bzr branch http://leaves.freeshell.org/envbot emerge-trunk11:41
AnMasterbzr: ERROR: http://leaves.freeshell.org/envbot/.bzr/checkout/format is redirected to http://myspace.com/redmartian11:41
AnMasterhum11:41
AnMasterhow do I branch it, I can pull from it but not branch from it11:41
AnMasterodd11:41
AnMasterthere is no checkout of it on server as far as I know11:41
PengIt's normal for there not to be checkouts on the server.11:42
PengAll that's needed is the ".bzr" directory.11:42
AnMasterso why this error?11:42
AnMasterand yes the .bzr is there11:42
AnMaster...11:42
Peng...11:43
PengWell, http://leaves.freeshell.org/envbot/.bzr/checkout/format redirects to http://myspace.com/redmartian.11:43
AnMasterPeng, yes I wonder why I get this error when trying to pull another developer's branch11:43
PengThat would be why you get the error.11:43
AnMasterPeng, it seems that server redirect any non-existing file to there11:43
PengThat's dumb.11:43
PengIs that branch using some ancient format or something?11:44
PengThat file isn't new.11:44
PengOh.11:44
PengNo .bzr/checkout at all. Which makes sense.11:44
=== Peng shrugs.
PengI don't know why Bazaar cares about that file.11:44
PengBut redirecting 404s to MySpace is the dumbest thing I've ever heard of.11:45
Peng</mean>11:45
AnMasterPeng, I agree11:45
=== AnMaster is complaining to that developer now
=== Zindar [n=erik@stockholm.ardendo.se] has joined #bzr
AnMaster http://pastebin.ca/73054211:55
AnMasteranyone got any idea about that?11:55
AnMasterPeng, maybe you?11:57
PengAnMaster: Not sure. Is it a checkout or a branch?11:59
AnMasterthis is a branch of that repo11:59
PengI know I've heard of this, I just don't remember it.11:59
PengAugh, Barney.11:59
AnMasterRepository checkout (format: dirstate-tags)11:59
AnMasterLocation:11:59
AnMaster  repository checkout root: .11:59
AnMaster        checkout of branch: http://www.vmlinux.org/jocke/bzr/bzrweb/11:59
AnMaster         shared repository: /usr/home/envbot/bzrweb11:59
PengIt's a checkout.11:59
AnMasterhm what11:59
AnMasterodd11:59
Pengbzr unbind11:59
PengI think there's a bug filed on that locking error, and it might've been fixed.12:00
=== mvo [n=egon@p54A67164.dip.t-dialin.net] has joined #bzr
AnMasterinteresting12:00
AnMasteris there any plugin or something for cherrypicking, while other version control systems support it, they don't support other features that bzr got (like support for "dumb" static pages only web servers)12:02
AnMasterPeng, so I need some combination of mercurial and bzr it seems12:02
=== luks [n=lukas@wireless-235.fi.muni.cz] has joined #bzr
PengI have no idea. :P12:05
mwhudsonmercurial doesn't have any more support for cherrypicking than bazaar does, does it?12:07
jelmerdon't think so. darcs is the king of cherrypicking12:08
jelmerI mean, I don't think mercurial supports cherrypicking mor ethan mercurial12:08
PengMercurial has the transplant extension.12:08
PengNot sure how well it does it.12:08
mwhudsonbzr has the rebase plugin, too :)12:09
=== bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr
AnMasteris there anything like git bisect for bzr?12:18
=== i386_ [n=james@ppp239-169.static.internode.on.net] has joined #bzr
jelmerAnMaster: there is bzr-bisect12:22
AnMasterah, link?12:22
jelmerhttps://launchpad.net/bzr-bisect12:24
AnMasteras for cherrypicking, I need something comparable to svnmerge http://www.orcaware.com/svn/wiki/Svnmerge.py12:24
=== jrydberg_ [n=Johan@c80-216-246-123.bredband.comhem.se] has joined #bzr
jelmerthat's not possible yet as Bazaar does not have per-file properties yet12:29
jelmeralthough I guess it is possible to set revision properties with that information12:29
AnMasterjelmer, hm12:29
=== Zindar [n=erik@stockholm.ardendo.se] has joined #bzr
AnMastereasy handling of back/forward merging between stable and development branch and ability to ignore some changesets from list of changes to merge back to stable branch12:30
AnMasterthat is what I need12:30
AnMasterand tracking what changes have been merged back of course12:31
AnMasterjelmer, so what distributed version control systems can handle that?12:31
Zindaryou want partial merges?12:32
AnMaster<AnMaster> as for cherrypicking, I need something comparable to svnmerge http://www.orcaware.com/svn/wiki/Svnmerge.py12:32
Zindaroki.. darcs is the best at that.. but sucks in many other ways12:33
Zindarbut .. it's made to do exactly that12:33
Zindarbzr isn't... it is planned12:33
AnMasteryes so I understood, but bzr got several other nice features12:33
AnMasterZindar, any idea when12:33
Zindarit's the one feature I really really want12:33
Zindarpost 1.0 sometime I would think12:33
AnMasterand when will that be?12:33
AnMasterthis year?12:33
PengAnMaster: Mercurial puts changes in their stable branch then merges them into the development branch.12:34
Zindar1.0 will be I think.. but.. when the cherrypicks will come.. no idea12:34
Peng(I mean that's how the Mercurial project handles it.)12:34
Zindarpeng: hg, git, bzr all can do it...12:34
=== mvo_ [n=egon@p54A67164.dip.t-dialin.net] has joined #bzr
AnMasterPeng, I need to be able to both handle forwardport and backport12:34
Zindarbut the tracking is less then optimal12:34
AnMasterand yes I understood that darcs got many other problems and I would prefer to stay with bzr, but I need this feature quite fast12:35
ZindarAnMaster: you CAN handle it in bzr.. but it doesn't track the log, and you'll get the same thing twice when you go back and forward12:41
Zindarso.. less then optimal12:41
AnMasterindee12:48
AnMasterindeed*12:48
AnMasterso I'm looking for a usable solution12:48
AnMasteras I can't handle it with maybe 200 changes ignored and 50 ones spread out between them that have been merged back12:49
AnMasterbecause it is not merging forward that is most common, merging back is12:49
luksdo you ever merge the backported branches (complete branch, not just cherry picking) back to the dev branch?12:51
AnMasterprobably not but could happen12:52
luksI don't see the problem with bzr/hg/git-like cherry picking then12:53
AnMasterthey may diverge, for example if some bug fix that affects backported branch but not dev branch because dev branch have rewritten that entire module or such12:53
luksbut then you need a new fix, not the cherry-picked one from the dev branch12:54
AnMasterindeed12:56
AnMasterluks, but a lot of the time changes can be backported by cherry-picking12:56
luksso, bzr merge -rbefore:X..X && bzr commit12:57
AnMasterthat doesn't keep track of what changes I merged back last I tried12:57
AnMasterwait, before: ?12:58
luksyep, but my point is that you don't need that12:58
AnMasterluks, I do when I need to see if I merged back some change or not, and if I decided to not merge it back12:58
luksbefore: is the left-most parent revision12:58
luksAnMaster: well, you see the commit message12:59
AnMasterbecause I can't keep track of something like what 50 revisions out of maybe 200 revisions were merged back in my head12:59
luksbut you still do the merges manually12:59
lukscherry-picking tracking is only useful for automatic merges12:59
luks(when you merge the whole branch)01:00
AnMastersvnmerge is manual (http://www.orcaware.com/svn/wiki/Svnmerge.py), yet I would call it much more useful than your suggestion01:00
lukshow is it more useful?01:00
AnMasteras in "possible to handle with a lot of changes"01:01
=== luks still fails to see the problem
AnMasterafk01:01
luksthe cherry picked changes will have different revnos in svn01:01
luksso you still can't see which changes were merged01:02
AnMasteryes I can, because it is stored in svn properties01:03
lukssvnmerge is only useful if you go the other way around, that is if you decide to merge the branch with cherry-picked stuff back to the dev branch01:03
AnMasterread the link I gave01:03
luksI know about svnmerge, I01:03
luksI've used it a lot01:03
luksbut then I found out bzr-svn :)01:03
AnMasterexample:01:05
AnMastersvnmerge avail01:05
AnMaster8074,8079-8080,8082-8083,8088-8089,8097-8098,8101-8103,8107,8109-8112,8115-8118,8121-8127,8129-813001:05
AnMaster<luks> svnmerge is only useful if you go the other way around, that is if you decide to merge the branch with cherry-picked stuff back to the dev branch <-- so yes I can see what ones can be merged01:06
AnMaster$ python ./svnmerge.py integrated01:06
AnMaster132-7508,7510-7516,7519-7525,7527-7536,7538,7553,7557-7560,7573-7576,7580-7586,7601-7603,7605,7607-7613,7615-7620,7622,7624,7626,7628,7632,7634-7664,7667-7669,7671-7675,7677-7692,7694-7714,7717-7722,7726-7727,7729-7732,7734-7741,7744-7752,7755,7762-7766,7770-7794,7796,7798-7806,7809,7814-7819,7821-7828,7832,7838,7852,7877,7879,7952,7982,7995,8003,8005,8009,8019,8023,8029,8031,8035,8037,8040,8042,8044,8066,01:06
AnMaster8069,8071-8072,8075,8077,8084,8086,8090,8092,8099,8113,8119,8131-8132,8134,813601:06
AnMasterluks, so what do you mean with "<luks> so you still can't see which changes were merged"01:09
luksI didn't know about 'svnmerge.py integrated'01:10
AnMasterthere you are then01:10
luksbut this approach would really not work well in and DVCS01:10
luksany01:11
AnMasterindeed01:11
=== NamNguyen [n=NamNguye@cm38.delta196.maxonline.com.sg] has joined #bzr
AnMasterbut really that is an example from inspircd's stable branch. luks could you keep track of that without something like svnmerge avail/integrated? if you could, I'm impressed by your memoru01:12
AnMastermemory*01:12
luksI prefer to not keep track of things like this myself01:13
luksif I have a bug, and I need to backport it, then I backport it01:13
AnMasterexactly, so I need bzr to keep track of it for me01:13
quicksilverI've never wanted to have cherry-picking on that kind of scale01:13
quicksilvermaybe I just haven't worked on projects like that01:13
luksand forget about it (in my head, not in my VCS)01:13
luksin bzr you can have custom per-revision properties01:14
luksso theoretically you could write a plugin that remembers which revisions were merges01:14
AnMasterluks, no I can't because I don't know python01:14
luksthe problem is that this info wouldn't be very useful if you have more than one branch01:14
luksit works in svn, because you have incremental per-repo revnos01:15
AnMasterbut I need some way to keep track of cherry picking on this scale and even larger01:15
luksor even better you could always associate commits with bug IDs01:16
luksand then check for fixed bug IDs, not revisions01:16
AnMastersure but some bugs you discover when coding something else, then you fix it without first opening a bug01:17
AnMasteranyway didn't know you could integrate bzr with trac in such a way01:17
lukswell, not with trac01:17
=== cfbolz_ [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
luksbut there is 'bzr commit --fixes'01:17
AnMasterluks, and I use trac01:17
AnMasterand that doesn't work with ci --fixes afaik?01:18
AnMaster+ what about reopened bugs01:18
lukstrac would need to be tweaked to understand this data01:18
luksbut yeah, it wouldn't work for reopened bugs01:18
AnMasterindeed01:18
=== herzel104 [i=herzel@gateway/tor/x-2f4cb4d178e50c85] has joined #bzr
AnMasterluks, but why are you so much against cherry-picking?01:19
AnMasterI can't see why01:19
luksI'm not against cherry-picking at all01:19
luksthe problem is that in DAG-based systems it's not trivial to implement true cherry-picking, because it breaks the graph01:21
AnMasterstill it is a feature I need :)01:21
quicksilverThere is an objection to cherry-picking which is that it is unsound, because revisions potentially depend on all preceding revisions01:21
hsn_i need cherry pick as well01:21
quicksilverhowever, if the programmer is prepared to deal with the unsoundness then that's his problem01:22
AnMasterquicksilver, maybe, but what would you suggest instead to handle stuff like the example above01:22
luksAnMaster: I think you need a list of manually merges changes, not a true cherry-picking01:22
quicksilverAnMaster: I would bzr merge in the changes I wanted; or in some cases apply diffs by hand if the commit was not atomic enough01:23
quicksilverAnMaster: and I'd make notes of what I was doing in the commit message01:23
lukse.g. I use https://code.edge.launchpad.net/~luks/+junk/bzr-pick for semi-automatic cherry-picking01:23
quicksilverAnMaster: if the scale of the problem grew larger, I would structure my commit messages in some standard way01:23
quicksilverAnMaster: and then write tools to gnerate the right messages and parse the log file01:23
luksit would be trivial to add revision properties to remember the origianl revision IDS01:23
luksand give you the list later01:23
luksbut I don't think the list would be useful to you01:24
AnMasterluks, something like svnmerge indeed, and I normally merge 1) from other developers stable branch to my stable, and other developers trunk to my trunk. 2) from my trunk to my stable and from my stable to my trunk01:24
AnMasternot really from other devlopers trunk to my stable01:24
AnMasterluks, "+junk"?01:24
luks"+junk" = no product in launchpad01:25
AnMasterah01:25
=== AnMaster doesn't use launchpad
luksthe plugin does nothing else but: bzr merge -r before:X..X && bzr commit01:25
luksbut it's nice to have it in one step, and don't have to copy&paste commit messages01:25
quicksilverAnMaster: mind you, I wasn't actually *objecting* to cherry picking01:26
quicksilverAnMaster: I was just letting you know what an objection might be01:26
AnMasterhm01:26
quicksilverit's not clear that it has a sound semantic model :)01:26
AnMasterok, still it is clear to me that not having some system to handle the problem is unsound for developers01:27
AnMaster;P01:27
=== EtienneG [n=etienne@ubuntu/member/EtienneG] has joined #bzr
quicksilvergenerally speaking, I don't share changesets between branches to that extent01:28
quicksilverif they are that close, I merge them01:28
quicksilverif they're not close, I don't bother to keep back and forward porting stuff :P01:28
AnMasterdepends. for inspircd (using svn), it is about 1.1 is stable and there are new maintenance releases of it, while 1.2 (trunk) is rewriting some core parts, still code in many of it's modules is mostly the same01:29
quicksilvercertainly there are many different ways to organise projects01:29
quicksilverand many different ways to use your VCS01:30
AnMaster1.2 changes how it handles nicks for example by changing to using UUIDs for users to track them instead of using nick for it01:30
AnMasterand my irc related project that uses bazaar is now about first stable version too, and we would benefit from the same development model, apart from that we also need to be distributed01:31
=== cfbolz_ is now known as cfbolz
=== cprov-out is now known as cprov
=== mrevell is now known as mrevell-lunch
=== corporate_cookie [n=richie@seraphim.asbury.edu] has joined #bzr
=== mrevell-lunch is now known as mrevell
=== niemeyer [n=niemeyer@200-138-54-64.ctame705.dsl.brasiltelecom.net.br] has joined #bzr
=== zorg_the_false [n=zorglub@102.43.102-84.rev.gaoland.net] has joined #bzr
zorg_the_falseq. i use eclipse 3.3 for a c++ code of around 330kline, what is the status of the eclipse plugin ?03:13
=== schierbeck [n=daniel@muhammed.egmont-kol.dk] has joined #bzr
schierbeckjelmer: hello03:14
corporate_cookieIs the default python interpreter usually specified with a symlink ?03:15
quicksilveron debian that's certainly typical03:18
corporate_cookiethanks quicksilver03:18
quicksilverdebian (and debian-derived OSes) symlink binaries via /etc/alternatives03:18
corporate_cookiethis is what i thought ..however i changed the symlink on RHEL4..and the default interpreter did not change03:19
corporate_cookiealas : )03:19
quicksilverto be honest, default is a fiddly concept03:21
quicksilverwhat actually *matters* is what the #! line says03:21
quicksilverif your #! says /usr/bin/python2.3 then it's going to use that03:21
quicksilverif #! says /usr/bin/python and /usr/bin/python is a symlink, then that's fine03:21
zorg_the_falseq. i run kubuntu feisty, any suggestion for a 'good' ui frontend ?03:22
=== jaavaaguru__ [n=jaavaagu@193.38.158.14] has joined #bzr
corporate_cookiequicksilver: ...alas I'm just a lazy bum who doesn't want to change quite a few #! lines03:25
zorg_the_falsesudo apt-get install bzr-gtk -> "bzr-gtk: Depends: bzr (< 0.91~) but 0.91-2 is to be installed"03:27
quicksilvercorporate_cookie: then blat a symlink over whatever the #! is pointing at03:28
zorg_the_falsebut0.91-2 is the one provided by the repository03:28
quicksilvercorporate_cookie: so if the #! is /usr/bin/python2.3, make that a symlink to what you want03:28
corporate_cookiethanks quicksilver03:29
zorg_the_falseah ok the repository doesnt contains the last version of bzr-gtk03:29
zorg_the_falseit is only available from source03:29
=== bwinton [n=bwinton@mail.phantomfiber.com] has joined #bzr
=== fog [n=fog@debian/developer/fog] has left #bzr []
=== AfC [n=andrew@ip67-91-236-167.z236-91-67.customer.algx.net] has joined #bzr
=== FredT34 [n=chatzill@ADijon-106-1-40-233.w217-128.abo.wanadoo.fr] has joined #bzr
=== Demitar [n=demitar@c-212-031-182-147.cust.broadway.se] has joined #bzr
=== orospakr [n=orospakr@132.213.238.4] has joined #bzr
jelmerschierbeck, hi04:26
=== bwinton [n=bwinton@mail.phantomfiber.com] has left #bzr []
=== mthaddon [n=mthaddon@canonical/launchpad/mthaddon] has joined #bzr
=== p4tux [n=p4tux@189.169.95.23] has joined #bzr
=== luks [n=lukas@unaffiliated/luks] has joined #bzr
=== AfC [n=andrew@ip67-91-236-167.z236-91-67.customer.algx.net] has left #bzr []
=== Peng [n=mnordhof@fl-69-69-146-1.dyn.embarqhsd.net] has joined #bzr
=== zorg_the_false [n=zorglub@18.43.102-84.rev.gaoland.net] has joined #bzr
=== poolfool [n=poolfool@techsat21.itnes.com] has joined #bzr
=== metze is now known as metze_away
=== cprov is now known as cprov-lunch
AnMasterhm launchpad seems quite ubutntu specific, it should really be more distro neutral05:38
AnMasterto be any useful05:38
=== eolo [n=eolo@217-133-1-186.b2b.tiscali.it] has joined #bzr
AnMasterof course not sure what is the right place to complain about that05:39
mrevelljelmer: Hi - can you answer a quick question about lp:05:39
mrevellAnMaster: Hi05:39
mrevellAnMaster: I work for the Launchpad team05:39
mrevellAnMaster: What changes would you like to see to Launchpad to make it more distro neutral?05:40
AnMastermrevell, I'm a FreeBSD user so all the ubutntu stuff in the settings for user account seems a bit offending05:40
eolohi all. I have a dramatic problem with official docs!! Is there a straightforward 'howto' to start a bzr smart server accessed via bzr+ssh?05:40
AnMasterlike ubuntuwiki, why would I want that05:40
AnMasterif you want a wiki, why not a launchpad wiki instead05:41
Pengeolo: The only setup needed is bzr in the PATH ..05:41
AnMasterwhy force it to be ubuntu wiki05:41
AnMaster"This is your wiki name in the Ubuntu wiki. You cannot remove it because without it you won't be able to login there."05:41
AnMaster...05:41
AnMasterI have no plans to login there05:41
radixAnMaster: I use Launchpad without doing anything related to Ubuntu at all, and it doesn't get in the way at all05:41
AnMaster"Ubuntero:  No (apply now)  "05:42
AnMasterwhat is that btw?05:42
eoloPeng: what do you mean, bzr is by default in the path: /usr/bin/bzr05:42
mrevellAnMaster: Right, I see. The Ubuntu wiki uses Launchpad to authenticate users. Does it get in your way?05:42
mrevellAnMaster: An Ubuntero is someone who has signed the Ubuntu Code of Conduct.05:42
AnMastermrevell, not really I guess but why not make it distro neutral.05:42
AnMasterok so what about <other distro> wiki/code of conduct05:43
lukseolo, then it should just work, no need to 'start' anything except your ssh server05:43
AnMasterdo you support that too?05:43
AnMaster:)05:43
eoloPeng: The server starts but i cannot connect to it to branch05:43
eoloperhaps i'm using wrong addresses05:43
AnMastermrevell, if you did fine, it is this ubuntu fixation that gets irritating for non-ubuntu users05:44
AnMastermrevell, by the way, is the code for launchpad open source?05:44
mrevellAnMaster: You can add other wikis to your Launchpad profile. I'll post a message to the launchpad-users list with your comments. Ubuntu has obviously been a major user of Launchpad since the beginning but more and more projects are now using Launchpad. I'll raise your concerns with the LP team.05:44
Pengeolo: Well then, it should work.05:44
eoloi shouldn't issue the command bzr serve?05:45
luksbzr serve is for bzr://05:45
eoloand for bzr+ssh?05:45
mrevellAnMaster: Launchpad isn't yet open source but I know that our aim is to release it as open source.05:45
lukseolo, a ssh server05:45
AnMastermrevell, ah nice. oh and at least it shouldn't list ubuntu wiki at contact details05:46
AnMasteror at least be possible to disable that05:46
AnMastercan't find where to disable it05:46
mrevellAnMaster: I think the wiki is listed under contact details as it's an opportunity to tell more people where to find out more about you.05:46
AnMastermrevell, and the way you do wiki user pages indicate they should be in root namespace of wiki05:47
luksmrevell, not if it's wiki.ubuntu.com and the person doesn't use it :)05:47
AnMastersome people use mediawiki and such where that is not the case05:47
mrevellAnMaster: You mean rather than MediaWiki's User:Name?05:47
AnMasterexactly05:47
AnMasterthen my username is still Name and base url is still http://foo.whatever  but url to user page is not http://foo.whatever/Name05:48
eoloso if i have a bzr repo in /home/user/django-projects an a remote host which command should i use to branch from there?05:48
mrevellAnMaster: You could type User:YourName in the box, that's no problem.05:48
mrevellluks: I think we have a bug about this actually. Let me find it05:48
AnMastermrevell, and really as luks said, that wiki I never visited or plan to visit05:49
eolo?? Should i have initialized the repo in a special way?... sorry about silly question05:49
lukseolo, bzr branch bzr+ssh://example.com/home/user/django-projects/project05:50
AnMastermrevell, and another detail, some developers may not be tied to any specific os/distro05:50
AnMastereven though FreeBSD is my primary OS05:50
AnMasterI also use OpenSolaris and OpenBSD05:50
AnMasterand sometimes even linux (Slackware mainly then)05:51
mrevellAnMaster: Here's a link to a bug report that deals with your complaint: https://bugs.launchpad.net/launchpad/+bug/29542 Would you mind adding your comments there? I'll still raise your issue with the LP team05:51
ubotuLaunchpad bug 29542 in launchpad "Launchpad pages have hardcoded references to Ubuntu" [Medium,Confirmed] 05:51
AnMasterubotu? argh this place is infected ;)05:52
eololuks: ERROR: Not a branch: ????05:52
lukseolo, do you have a branch there?05:52
AnMasterelmo, try sftp too instead of bzr+ssh I guess05:52
AnMastermrevell, is pasting parts of irc log ok? I'm not motivated to write it down once again05:53
mrevellAnMaster: So long as it's edited to be specific to the issue, that's fine.05:53
AnMasterindeed I will cut out other bits of course05:54
mrevellAnMaster: thanks :)05:55
AnMastermrevell, btw you don't need to highlight me on every line, once every now and then works fine05:57
AnMaster;P05:57
AnMastermrevell, for bug tracker, any special stuff needed to make it not mess up newlines06:00
AnMasterlike {{{ }}} of trac06:00
AnMasteror <pre> or whatever of others06:00
=== AnMaster mostly use trac, mantis and mediawiki
mrevellThere isn't a pre-formatted option for the LP bug tracker.06:01
AnMasterno preview button I notice06:01
radixLP bug comment text is already pre-formatted, it won't mess up your new lines06:01
AnMasterah seems to be pre-formatted anyway good06:01
radix(and description text)06:01
AnMasterradix, well I see that now, but other systems are not the same06:01
AnMastermrevell, anyway added comment with what I think is relevant06:02
mrevellAnMaster: Thanks!06:02
AnMastermrevell, what language is launchpad in?06:02
mrevellPython06:03
AnMasterwould it work with fastcgi or does it depend on a LAMP setup or such?06:03
=== AnMaster prefers freebsd + lighttpd + fastcgi + postgresql
=== BasicOSX [n=BasicOSX@errant.real-time.com] has joined #bzr
AnMastersomething to note for when you make it open source06:04
AnMastermrevell, :)06:04
AnMastermrevell, hm this "ppa" seems ubuntu specific too06:07
mrevellAnMaster: Launchpad is built around a PostgreSQL, modified Zope and Apache setup.06:08
AnMastershould be called "uppa" then ;)06:08
mrevellas for PPA, yes right now it is Ubuntu specific but it may well be made available for other distros in the future. I think the plan is to complete the beta and get it into production and then to look at what might come next.06:09
AnMastermrevell, so ppa is a server side build system to build for different arches?06:09
=== AnMaster ponders unusual languages like D
AnMasterC/C++ and a few more sure06:10
mrevellPPA is a build system, yes, but also an apt repository hosting service. It supports x86 and AMD64 atm06:10
mrevellAnMaster: We should probably take this to #launchpad if we carry on. Don't want to hijack the bzr channel :)06:10
AnMasterah ok didn't know about that channel06:11
AnMastermrevell, just one thing: <ubotu> Your edit request has been forwarded to #ubuntu-ops.  Thank you for your attention to detail06:11
AnMasterhuh?06:11
mrevellWhere did you see that?06:12
AnMasterin /msg here on freenode06:12
=== acuster [n=acuster@12.Red-81-41-242.staticIP.rima-tde.net] has joined #bzr
AnMasterI didn't say anything to it in /msg or anything06:13
AnMasterso I don't know what it is on about06:13
AnMastermrevell, any idea?06:13
mrevellAnMaster: Let me look into that for you06:13
AnMasterI did not enter any irc info into my profile, or rather I did, and then removed it directly06:14
AnMastermrevell, so what caused it?06:18
mrevellAnMaster: I'm not all that familiar with Ubotu but there's a page that explains more about it at https://wiki.ubuntu.com/UbuntuBots The person that maintains ubotu - seveas - appears to be offline atm06:20
AnMastermrevell, well I can't be bothered to try to find that person, so if you like you said will handle it, fine for me06:20
AnMaster:)06:20
mrevellI'll see what I can find out for you06:21
AnMasteras far as I know I didn't give it any command...06:22
AnMastermrevell, btw, the message was at 17:52:23 (UTC+2)06:22
mrevellok, thanks06:23
AnMasterhm06:23
AnMaster<AnMaster> ubotu? argh this place is infected ;)06:23
AnMasterwas at that point06:23
AnMastersilly of it to react on that if that is what it did06:23
=== asak [n=alexis@201-27-62-36.dsl.telesp.net.br] has joined #bzr
=== bigdog [n=scmikes@72-197-8-8-arpa.cust.cinci.current.net] has joined #bzr
=== jeremyb [n=jeremy@unaffiliated/jeremyb] has joined #bzr
LarstiQ6/names06:40
LarstiQmeh06:40
=== fullermd steals one of LarstiQ's 6 names.
LarstiQ:)06:41
=== bac is now known as bac_afk
=== keir_ is now known as keir
=== patux [n=p4tux@189.169.95.23] has joined #bzr
acusterHey all, how do I cleanup a bzr branch? i.e. bzr branch trunk working, then I want to blow away working?06:56
=== lifeless_ [n=robertc@ppp245-86.static.internode.on.net] has joined #bzr
mwhudsonrm -rf06:58
jaavaaguru__rm -rf working?06:58
acusterand the shared repository doesn't mind?06:58
acusterhow does it clean itself up?06:58
mwhudsonah, you can end up with some unreferenced revisions in there06:59
mwhudsonmy general approach to that is to not care06:59
mwhudsonthough i think there's a plugin that can remove them07:00
=== fog [n=fog@debian/developer/fog] has joined #bzr
acusterthat kind of cruft has a way of coming back to bite me07:03
=== cprov-lunch is now known as cprov
acusterah, so bzr needs a remove-branch command07:04
zorg_the_falseq. i use eclipse 3.3 for a c++ code of around 330kline, what is the status of the eclipse plugin ?07:25
=== Vernius [n=tomger@p508AF0E2.dip.t-dialin.net] has joined #bzr
=== cfbolz_ [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
james_wzorg_the_false: I'm not sure. I think it has basic functionality.07:57
zorg_the_falsejames_w: ok. i dont need big funky. but i do need stability...07:58
zorg_the_falseaka this is my text editor when i code :)07:58
zorg_the_falselet me code, dont crash :)07:58
=== jaavaaguru___ [n=jaavaagu@jaavaaguru.plus.com] has joined #bzr
=== cfbolz_ is now known as cfbolz
=== dpm [n=dpm@p54A1363F.dip0.t-ipconnect.de] has joined #bzr
ubotuNew bug: #151027 in bzr "[bug]  RepoFetcher run between the same location" [Low,Triaged]  https://launchpad.net/bugs/15102708:20
=== jaavaaguru___ is now known as jaavaaguru
=== BasicOSX [n=BasicOSX@errant.real-time.com] has joined #bzr
=== marianom [n=marianom@ubuntu/member/marianom] has joined #bzr
=== dennda [n=dennda@ubuntu/member/dennda] has joined #bzr
denndahi there08:35
denndai have a problem with pushing my updates08:35
denndahttp://pastebin.ca/73102008:36
denndaany idea why that is08:36
fullermdhttp isn't writable, so you can't push over it.08:38
denndathats https. and if i am not totally mistaken, this worked once08:38
denndaanyways: how can I solve this then?08:39
fullermdhttps is just http with bits scrambled  ;p08:39
james_wdennda: you need to use sftp://08:39
fullermdYou want to use bzr+ssh instead (or sftp, but bzr+ssh is better)08:39
fullermdThe LP page for that branch should tell you the URL via that scheme.08:39
denndabzr +ssh says Permission denied (publickey).08:40
denndaerr08:42
denndano ssh key08:42
denndathat's probably it08:42
=== fullermd nods.
fullermdLP only does key auth.08:42
=== joes2 [n=user@adsl-065-012-220-185.sip.bct.bellsouth.net] has joined #bzr
joes2hi. any sysadmins around for the apache server which hosts the wiki?08:49
joes2i'm the sysadmin for apache.org, and would like to help you with your spam problem08:50
james_wjoes2: great, thanks. I'm not sure who the admins are. There was some discussion on the list about the spam problem recently.08:51
james_wI think the admins are canonical's sysadmin tead.08:51
james_ws/tead/team/08:51
Pengtead: team lead? :)08:53
joes2those guys don't hang out here?08:54
james_wsometimes, I'm not sure who all the team are, so I can't say for sure.08:55
james_wjoes2: if you would post to the list I am sure you would get somewhere. I don't think there is anyone who really knows online at the moment.08:55
joes2which list?08:55
james_wunless you want to wait a couple of hours for lifeless or poolie08:55
james_wbazaar@lists.canonical.com at least someone will know who to contact.08:56
joes2it's not urgent.  at apache.org i think we've managed to drive the spammer off.08:56
joes2i was wondering if the same thing would work for your wiki08:56
james_wthat's good, it would be great to use your skills. Sorry I can't give you the information that you need right now.08:57
joes2are they on .eu time?08:57
james_w.au08:57
joes2ok. i'll try back later then. thanks for the info08:58
james_wthanks.08:58
=== FredT34 [n=chatzill@81.56.254.70] has joined #bzr
=== joes2 [n=user@adsl-065-012-220-185.sip.bct.bellsouth.net] has left #bzr ["ERC]
=== acuster is now known as avc_eats
=== baijiutong [n=pjjw@c-67-170-80-138.hsd1.wa.comcast.net] has joined #bzr
baijiutongdoes anyone know if it's possible to use bzr-svn to only push to svn repos when you tell it to?09:09
baijiutongwhen i do a 'ci' on a repo that i've cloned from a svn repo, it pushes it to the svn repo09:10
baijiutongi'm almost brand new to bazaar, so maybe that's not the right workflow for things.09:12
=== cfbolz [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
=== cfbolz [n=cfbolz@p54AB8A60.dip0.t-ipconnect.de] has joined #bzr
james_wbaijiutong: you probably want to run 'bzr unbind'09:31
baijiutongokay09:31
baijiutongwill that allow me to push back to the svn repo, or should i be using branches and merges for that?09:32
james_wbaijiutong: in future if you use 'bzr branch' instead of 'bzr checkout' then you will get what you want.09:32
james_wsee 'bzr help checkouts' for some more information on the difference.09:33
baijiutongi figured that out playing about just now, sorry :)09:33
james_wbaijiutong: no problem. I'm glad you are sorted.09:34
baijiutongsomeone's finally got a patch for the python subversion bindings at least proposed to macports09:34
baijiutongso this is my first chance to really play around with bzr.. :)09:34
=== Roua1 [n=Raidenn@dsl-242-58-133.telkomadsl.co.za] has joined #bzr
=== Roua1 [n=Raidenn@dsl-242-58-133.telkomadsl.co.za] has left #bzr []
=== Gwaihir [n=Gwaihir@ubuntu/member/gwaihir] has joined #bzr
=== marianom [n=marianom@ubuntu/member/marianom] has left #bzr []
baijiutongahh, and then from that branch, when you want to commit to svn, you push it there09:42
baijiutongoh, too bad it does them each as individual commits.. i was hoping to hide stupid mistakes i make on my own from my coworkers :P09:43
=== corporate_cookie [n=richie@seraphim.asbury.edu] has joined #bzr
=== cypherbios [n=cyr@ubuntu/member/cypherbios] has joined #bzr
=== dash [n=washort@tesla.divmod.com] has joined #bzr
dashI've got uncommitted changes in my WC. I'd like to make a new branch and commit those changes to that branch, instead of the current one.09:51
dashis there an obvious command for doing that?09:51
dashor should I branch first, commit, then rename the directories? :)09:51
fullermdbranch ; merge --uncommitted09:51
dashaha.09:51
dashi sort of remember that now.09:51
fullermdWell, that way works too, and may be easier.09:51
fullermdOr even commit, branch the old rev, and rename the dirs.09:51

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!