/srv/irclogs.ubuntu.com/2010/03/03/#bzr.txt

jasonlifeDo I create one repo per project? or one repo for all projects ?00:08
jasonlifeDo I have to00:08
bob2either00:08
bob2there's no storage-space benefit to the latter00:09
jasonlifeIs there no right way to maintain repo and project?00:11
jasonlifeIf I have just one repo, then it ends up with a lot of projects and their different branches in one place.. so it may be bad..00:12
bob2who cares?00:13
jasonlife:P00:13
jasonlifebzr maintains different directories for different branches of same project.. right?  I'm new to bzr..00:14
bob2a branch is a directory00:15
jasonlifein cvs, it maintains only one directory even if I created multiple branches..00:15
jasonlifethat's why I'm wondering..00:15
PengThe benefit of repo-per-project is if projects use incompatible repo formats, or if you want to delete a really large one or something.00:16
jasonlifeand I can use shared repo feature with different branches of same project I guess.00:19
PengYes. THat is what it is for.00:20
* igc lunch02:01
AfClifeless: I'm very intrigued by your commitfromnews plugin02:08
lifelessAfC: cool02:09
MTecknologyWith subversion you can proxy the traffic through apache so you can have pretty fine grained control over who can access what. Is there any easy way to do this with bzr? I was looking at the launchpad code to get an idea but that's pretty hard for me to understand and follow02:16
AfClifeless: Since most people can't be bothered (or taught, it seems) to write "good" commit messages, and since commit messages aren't editable in Bazaar, I've been increasingly down on them as a change log for a code base.02:19
AfClifeless: but the prospect of people editing ChangeLog files explicitly doesn't appeal much either (since merging branches with {NEWS, ChangeLog} type files is a nightmare)02:19
AfClifeless: your plugin makes me think that maybe the two together might be ok (as people could see the ChangeLog and be more likely to follow its patterns; and meanwhile the log|visualize view of history isn't completely useless02:20
AfClifeless: I realize full well that your plugin was for a file called NEWS, but it got me thinking.02:21
AfC[I know, I know, thinking without a licence. Scary, this free market economy]02:21
lifelessAfC: the plugin could be easily extended to support other file names.02:25
AfClifeless: no doubt02:25
lifelessMTecknology: there is a thing in contrib02:25
lifelessMTecknology: or unix file permissions02:25
AfClifeless: (it's the wisdom of it all that I'm mulling over)02:25
lifelessMTecknology: or you can hook into it02:25
lifelessAfC: so I wrote it because I've never liked 'bzr log' as a way toget a human meaninful summary of what has happened in a code base.02:25
lifelesseven if the commit messages are perfect, some changes union02:26
lifelesse.g.02:26
lifelessrev N, add feature02:26
lifelessrev N+M, change feature to be better02:26
lifelessrev N+M+Z do a release: but we should only mention feature /once/.02:26
AfClifeless: yeah02:27
AfClifeless: I'm not sure if this is what you're doing, but I'm guessing that in such a NEWS file × your plugin, the diff would show up at each merge up the chain of gatekeepers02:28
lifelessindeed02:28
lifelessand when doing a commit myself, I write the one for N02:28
AfClifeless: that would be good; one of my beefs is that I spend a lot of time writing the damn mainline merge commit messages; all the other bastards get away with one liners.02:28
lifelessfor N+M, I edit the NEWS entry02:28
lifelessand the plugin gives me the edit, which I then tweak to say 'improved thing from N'02:28
lifelessgive it a spin02:29
AfC[not the terms of warmth and affection for the wonderful contributors to the open source project I am the maintainer of]02:29
AfCs/not/note02:29
AfClifeless: in my case, NEWS is hand-crafted public release note, ChangeLog doesn't exist (based on our drooling enthusiasm of the early days of DVCS that we wouldn't need one anymore).02:29
lifelesssure.02:30
AfClifeless: I don't think I need *revision* resolution in a ChangeLog file, but a features, API changes, etc aggregation would be useful indeed02:30
lifelesswould you like a config option to set the filename02:30
lifelessor just have it grab stuff from both ChangeLog and NEWS ?02:30
AfClifeless: anyway, thought I'd give you some surface level first impression feedback02:30
AfClifeless: probably both?02:30
lifelessAfC: I just ordered a new laptop :)02:30
lifelessi7, 2 cores w/hyperthreading.02:31
lifelessthe bit that I possibly went overboard on, is memory and disk.02:31
AfClifeless: (NEWS file only gets tweaked in the final weeks before a release; on the other hand, what's really missing is a «changes» record of "what a branch actually introduces (feature, bugfix, whatever))02:31
lifeless8G, and a 128GB SSD02:31
AfCnice!02:31
lifelessyeah02:32
lifelesslenovo have about 35% off at the moment02:32
* AfC is undecided on whether or not an SSD would be a good idea for him or not02:32
AfCwhat I'd *really* love is an SSD for the /, /usr type stuff, and a fast spinnning HD for the dynamic and temporary stuff (ie, compiling fallout, web browser cache crap, etc). If I'd bought a 17" monster with 14,000 cores and two drive bays I coulda done it02:33
AfCbut with an itty bitty 12" with one drive bay and a ULV chip, no room for me. Not even a PCMCIA slot :)02:34
lifelessmine is 12", ulv02:35
RAOFThey do ulv i7s now?02:35
lifelessyup02:35
lifelessand i5's (can be better than i7 at the same clock rate), and i3's02:35
lifelesshttp://www.notebookreview.com/default.asp?newsID=5546&review=lenovo+thinkpad+x201+x201s+tablet02:36
lifelessthe x201s is what I ordered02:36
* RAOF is a big fan of his x200s02:36
lifelessRAOF: now they do touchpads, I'm happy ;)02:37
lifelessAfC: i7-620LM - the L is the low component, m is mobile02:37
RAOFOh, it's got a touchpad now?  Hm.02:37
lifelessAfC: i7-xxxM is mobile - all the voltages have shifted around:P02:37
lifelessRAOF: optional02:37
lifelessRAOF: depending on model, the x200t always has it, I believe.02:38
lifelesssory, 201t02:38
MTecknologythere's a bzr-email package in the repos. how does a person use that?03:04
lifelessif you install it and type 'bzr help email' it has online docs03:12
MTecknologylifeless: awesome, thanks :)03:13
pooliehi all03:59
lifelesshi04:00
parthm /leave04:44
poolieigc, hi?04:52
igchi poolie04:52
pooliejust wondered if you were around04:53
pooliei'm in the middle of something atm but wanted to chat04:53
pooliemissed you before04:53
igcnp04:53
lifelessI wish the bash completion knew about the switch sarch path04:58
poolieigc, how about now?05:00
igcpoolie: sure05:00
pooliei was thinking about bzr-grep vs your 'product as platform' thing05:00
pooliei'm a bit ambivalent about whether to merge it into bzr core or make it a platform05:01
igcpoolie: hmm05:02
pooliethe easy answer is to just let the author decide05:02
pooliethere are pros and cons05:02
igcI haven't been following the discussion to be honest05:02
poolieso, the details don't particularly matter05:03
lifelesspoolie: btw, if you want bzr-plugin-info in core; please just merge it05:03
lifelessI don't object, but don't have cycles atm05:03
pooliebut we have some new code that could be either a plugin or builtin05:03
poolielifeless: yes it applies to that too, though it's arguably a special case cause it helps with bootstrapping05:03
pooliemaybe i should just post to the lisnt05:03
lifelesspoolie: yes; I'm not proposing that you treat all things the same way ;)05:03
lifelesspoolie: I'm specifically saying not to wait for me.05:04
spivpoolie: drive by opinion: I think grep would be good to have in core.  I haven't carefully considered, it's just my initial reaction to the idea.  (Although maybe users will have a similar initial reaction?)05:04
igcpoolie: my initial reaction to "grep" is that it probably ought to be in core05:04
spivigc: snap!05:04
poolie:)05:04
* spiv wanders off05:05
igchi spiv! :-)05:05
lifelessw.r.t. grep, as a special request - consider making sure its hookable-enough for bzr-search to kick in when possible.05:05
lifelessmay be a YAGNI.05:05
spivigc: hi :)05:05
spivlifeless: interesting idea, probably a case of "land it first, refactor as necessary later", though?05:05
igcpoolie: is a 5 min phone call possible?05:06
poolieeminently posssible05:06
igcpoolie: I'd like a quick chat re the windows installers, ec2, etc.05:06
pooliecall me?05:06
igcpoolie: sure05:09
lifelessheh - cheap but humorous http://www.makeuseof.com/tech-fun/quick-glance-into-apples-future-pic/05:25
mwhudsonwow, bzr-svn is quite complicated05:30
lifeless...05:32
mwhudsonjust randomly griping05:35
mwhudsonit wasn't totally obvious to me what a CachingRevisionMetadata was05:35
mwhudsonalso the tests take ages and fail with the bzr i have installed05:56
* mwhudson tries bzr.dev05:56
=== mwhudson_ is now known as mwhudson
GaryvdMHi igc06:24
igchi garyvdm!06:24
igcgaryvdm: thanks for the numerous bug fixes to treewidget06:24
GaryvdM:-)06:25
GaryvdMigc: I made some big improvements to the treewidget tests last night06:25
igcGaryvdM: that's great news06:26
igcGaryvdM: I'm wondering whether the additioal filtering I'm doing in epxlorer is triggering some issues06:26
GaryvdMigc: Maybe that will make it possible to easily write a test for Bug 52998506:26
ubottuLaunchpad bug 529985 in qbzr "treewidget: list index out of range error" [Undecided,New] https://launchpad.net/bugs/52998506:26
igchopefully06:27
GaryvdMigc: Let me have a look at the be code06:27
igcGaryvdM: lib/wt_browser.py06:28
poolielifeless: i have a draft message here about patch pilots vs just helping people06:32
poolieto emphasize that there's "help people" and then "staff committing to do this as a timeslice"06:32
lifelesscool06:33
pooliedo you want me to finish/send it06:33
lifelessI think its worth teasing the issues apart06:34
lifelessif you think the mail will help with that, then you should send it06:34
poolieok06:34
GaryvdMigc: ha ha06:34
GaryvdM>                # This locks and unlocks the tree each time.06:34
GaryvdM>                # I wonder how that impacts performance?06:34
GaryvdMigc: Badly!06:34
poolielol06:35
GaryvdMigc: The code in _QBrowseFilterProxyModel could be better a taking advantage of TreeFilterProxyModel.06:37
GaryvdMigc: ie, if you overwrite filter_id rather than filterAcceptsRow, then you don't have to worry recursive loading, caching, and showing parents for children that are shown.06:39
GaryvdMigc: I'll fix that for you.06:40
igcGaryvdM: I'm just in the middle of something right now so I can't take a look. Is there any chance you could submit a MP or fire me an email with an explanation of what I need to do?06:41
GaryvdMSure06:41
igcthanks06:41
lifelesspoolie: around?06:49
lifelesspoolie: if so, up for a quick call?06:49
poolielet me finish this first pls06:50
poolie5m06:50
vilahi all07:04
igchi vila07:06
pooliehello vila07:20
pooliehow are things07:20
vilafine07:20
vilaslowly making my way in the review queue07:21
vilaI was wondering about https://code.edge.launchpad.net/~parthm/bzr/138600-2.1-mkdir-should-fail-on-invalid-parent/+merge/2019907:22
vilaShould we land it in 2.0 and 2.1 ?07:22
vilaWhat's your opinioin ?07:22
vilaonion even07:22
vilabah typos07:22
pooliemy opinion: thanks but no07:23
poolienot severe enough for 2.107:23
vilaha good, just the nudge I was waiting for :) I was 60% / 40% myself (for the same reasons)07:24
vilamy main reason was to minimize the SRU related overall patch size, so the autopack bug from jam was ok but the mkdir should clean wasn't07:26
pooliek07:27
poolieexplain nicely and i'm sure parthm won't be offended07:27
vilak07:28
vilaRegarding the grep plugin though, I'm for landing into core (but still as a plugin)07:29
vilalikewise for plugin-info07:29
vilaI don't want to merge *any* plugins, but these two are exceptions :)07:30
parthmpoole: i won't be offended :-)07:30
lifelessvila: I'm not really fussed on either; I think plugin-info has good reason to be outside [the case for updating preferred-lists without doing new releases of bzr itself]07:31
vilaparthm: Ha great ! :)07:31
poolielifeless: actually in that case possibly it's the list itself that should be separately updated07:31
vilalifeless: hmm, I'm tempted to say you can still install locally to override but...07:32
vilalifeless: Are you sure it will be updated *that* often (after some initial period) /07:32
vila?07:32
vilalifeless: I think plugin-info is targeted at users who don't know the ecosystem well and as such are unlikely to install it07:34
pooliethat's the thing07:34
vilamay be the preferred-lists can be updated on demand without updating the plugin itself ?07:35
vila12GB and thrashing.... wth ?? I can't believe that with 10.5GB active and 1.4G swap used there are enough processes swiping their entire memory space.... :-/07:38
poolierunning what?07:44
pooliei'd like to help with reviews but it's been an awfully interrupted week and looks set to continue07:44
vilapoolie: my desktop (including babune), no clear culprit to point my finger at, I'mm also running a bunch of emacses and firefox and whatnot07:45
vilaThat's fine, I nudge people when needed07:46
vilait also seems that runinng the test consume more memory that it used too, just a feeling across the various OSes, may just be yet another consequence of the leaking tests07:47
lifelessvila: poolie: I'm not arguing for or against particulary.07:58
vilalifeless: ok, I see your point anyway07:59
vilaGaryvdM: ping08:02
GaryvdMvila:pong08:02
vilapoolie: did you process GaryvdM's key for pqm08:02
vilaGaryvdM: https://code.edge.launchpad.net/~garyvdm/bzr/commit-BoundBranchOutOfDate/+merge/20393 any problem to send that to pqm ?08:02
poolievila, GaryvdM, sorry, no08:03
poolieit's flagged but i haven't done it yet :-(08:03
poolievila can you see if there's a typo or something, otherwise ping a sysadmin or send a signed rt08:03
GaryvdMvila: I would like to do it myself :-) poolie: I'm not in a rush08:03
vilaGaryvdM: to you want me to merge it or do you still want to use it to test pqm ?08:04
vilapoolie: typo where ?08:04
vilapoolie: is there an url to look at pending RT requests ?08:07
poolieGaryvdM, vila, there is already an rt for this, 3595308:12
poolieclaims to have been done08:12
poolie DCA3 ACB2 0CC7 D6D4 6100 18E6 77FD C477 018A 3A1D08:12
GaryvdMI'll retry then :-)08:12
poolieis that you?08:12
vilaGaryvdM: give a try and let us know08:12
vilagood08:12
GaryvdMpoolie: how do I check that?08:13
poolieGaryvdM: remove the trailing slash from the destination url08:13
poolienm, it is you08:13
pooliepqm is bizarrely pedantic08:13
vilaGaryvdM: and use submit_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev08:15
pooliei think that's the problem08:18
GaryvdMvila, poolie: Cool that worked.08:21
GaryvdMBut I got a NEWS conflict08:22
pooliewelcome :)08:22
GaryvdM:-)08:22
poolienot sure what's up with that08:22
pooliebetter ask spiv tomorrow08:22
pooliefor now, merge trunk and resubmit08:22
vilaGaryvdM: be sure to insert your netry sorted08:23
GaryvdMack08:24
GaryvdMvila: http://pqm.bazaar-vcs.org/ says the test for my patch is stuck on 0%. Is this normal?08:47
vilaGaryvdM: yes. :-/08:48
GaryvdMok08:48
vilaIt's not stuck, the progress report is bogus08:48
GaryvdMI see08:49
vilalifeless: I thought you fixed that ^ recently ?08:49
vilaGaryvdM: the important bit is that it accepted your request, now you'll get a feedback mail titled either 'success' or 'failure'08:50
vilathe later came with a full output08:50
GaryvdMvila: yes - that is cool. :-)08:50
GaryvdMNow that I can submit to pqm, I'm going to have to do *mini*-patch-pilot duties. :-)08:52
vilaGaryvdM: Welcome !08:53
lifelessvila: no, poolie added it.08:57
lifelessvila: its doing a progress bar08:57
lifelessvila: once spm: / lamont08:57
lifelessvila: once spm: / lamont: get the python-subunit package in the bzr chroot on balleny sorted out, we can move forward.08:57
vilaha, ok08:57
vilalosa: ping, thanks in advance ^ :)08:58
lifelessvila: there is an rt, its non trivial08:58
vilayeah,kidding08:58
* vila rejoices that it installed subunit once for all babune slaves :)08:59
* lifeless goes blind09:07
lifelesspython code written in 2007, that doesn't use optparse09:07
lifelessor getopt09:07
* vila sends some perl to lifeless 09:07
poolieGaryvdM: your branch merged, yay09:09
vilaGaryvdM: Congrats ! :D09:14
GaryvdMYay. Thanks for the help.09:24
GaryvdMBye. Need to focus on work09:24
PengEh, optparse is a pain. Every time I use it, I have to find the last script I wrote that uses it and still read the docs. For a quick hack with only one or two options, it's not worth the effort.09:51
PengOnce it gets more complicated than that, it's definitely worth switching to optparse, but before that? Eh.09:52
Pengs/find/copy and paste from/09:53
distaticaI'm trying to follow http://doc.bazaar.canonical.com/bzr.2.1/en/tutorials/centralized_workflow.html But I have a problem, when I use checkout and then commit it uploads as expected but clobbers the existing dir with my new group + permissions, making it unaccessible to other members of the group.09:54
distaticais there a way to stop the permissions from being written? Prefer something that doens't need to be included every commit if possible.09:55
fullermdOn a SysV filesystem, you need g+s on the dir to preserve the group ownership.09:55
distaticaoh, thank you09:55
fullermdbzr doesn't touch the group, so that's all in the filesystem.09:56
fullermdThe perms (e.g., g+w) bzr does, based on...  uh...  some dir.09:56
fullermdI just g+w everything under .bzr/09:56
lifelessPeng: optparse is less code @ 2 options09:58
Penglifeless: Yes, but it's code I have to look up first.09:58
lifelessPeng: even if it wasn't, getopt would be better than a manual parser09:58
lifelessPeng: you've been spoilt by bzrlib :)09:58
PengI've forgotten how to use getopt after spending time with optparse! :(09:58
PengSo I have to look it up too!09:58
lifelesscheck out gtester-report09:59
fullermdYou could just compromise and use Getopt::Std   8-}09:59
lifelessfullermd: acgggrle09:59
* fullermd sneaks back under his bridge.09:59
PengIn my most recent manual option parsing abomination, I _was_ using optparse. I was just doing it in a really stupid way and optparse could handle it much more simply.10:11
distaticathanks again fullermd, g+s fixed it perfectly.10:20
parthmvila: hi.10:48
vilaparthm: hey10:48
parthmso i was looking at bzrlib/plugins. whats needed to put a plugin there. seems like just a copy. right?10:49
lifelessPeng: do you mean to merge to core?10:49
lifelessbah10:49
lifelessparthm: ^10:49
lifelessparthm: or do you mean to install it ?10:49
parthmyes. i was talking in context of vilas comment on https://code.launchpad.net/~parthm/bzr/503670-grep-builtin/+merge/2042010:49
vilaparthm: well, as a plugin, you need to register (lazily) the command and put your files under bzrlib/plugins yes10:50
parthmiiuc i need to put the relevant files in trunk/bzrlib/plugins/grep/*10:50
vilayes10:50
lifelessoabzr branch lp:bzr-plugin-info10:51
lifelessparthm: ^10:51
lifelesscopy the setup.py from there10:51
lifelesschange appropriately.10:51
parthmlifeless: sounds fine.10:51
lifelessor grab the sample from the developer docs10:51
parthmone thing which came up was that the advantage of a plugin is that it can be used by 2.0/2.1 users.10:51
lifelessI like plugins10:52
lifelessmy default is 'plugin' ;)10:52
parthmdoes bzr provide a way for someone to checkout just bzrlib/plugins/foo?10:52
parthm:)10:52
vilaparthm: your call, there is no urgency into merging into core10:52
lifelessparthm: not really; there is views10:53
lifelessbut plugins in core are generally not maintained with backwards compat in mind.10:53
vilaparthm: I think maturing as a plugin for a couple of months is a good plan (and 2.0 users will love you too :)10:53
parthmyes10:53
lifelessthere is my branch somewhere to include arbitrary plugins in the tarballs we make10:53
lifelessbut that had a bug and noone fixed it10:53
parthmvila: :-) ... yes that sounds fine to me too.10:54
vilaparthm: in that case mark your mp as rejected and create a new one when you feel ready10:54
parthmvila: ok.10:54
parthmso as suggested i will continue to bzr-grep as a plugin for sometime and improve it based on feedback.10:56
parthmmaybe the bzr packaging (tar or installer) step should have a step to pick specified plugins to package them.10:57
parthmi think linux users are ok but i suspect windows users may not bother installing plugins manually.10:57
parthmthats the adv of prepackaged plugin vs external plugins10:57
vilaparthm: file a bug against bzr-windows-installer and osx asking for inclusion10:58
parthmvila: will do.10:58
parthmis there a way for including it in the source tarball thats released? or maybe getting it listed in synaptic?10:58
parthmi typically pick up my plugins from synaptic and don't bother manually installing.10:59
lifelessparthm: to include it in the source tarball, see the branch I wrote to do just that; its around somewhere.10:59
lifelessproblemis that it doesn't call into setup.py in each plugin.10:59
lifelessparthm: to list it in synaptic, package the plugin and get someone on the debian plugins team to upload it to debian11:00
lifelesswe can sync it from there to Ubuntu a day layer11:00
lifeless*later*11:00
parthmlifeless: ok. i can try to do it after a few weeks when the plugin has had some time to mature.11:01
parthmin the mean time i will add setup.py. how does bzr-plugin-info work, where does it get the plugin list?11:02
lifelessparthm: from cached.py' bzr plugin-info --python URL URL URL .... > cached.py is how that is updated.11:02
parthmlifeless: and URL is lp:bzr-xxx?11:03
lifelessyes11:03
parthmvila: maybe good to keep https://code.launchpad.net/~parthm/bzr/503670-grep-builtin/+merge/20420 open for some time. basically i am looking for review inputs. it can be rejected after review.11:04
parthmlifeless: thats sounds good.11:04
lifelessparthm: if you want review on the plugin; I suggest:11:05
lifelessbzr init an empty branch11:05
lifelessbzr push that to lp:bzr-grep (if vila will accomodate you :))11:05
lifelessthen submimt your branch to lp:bzr-grep as a merge proposal11:05
parthmlifeless: ah. ok. thats sounds like a better way. i will try that.11:06
vilalifeless: parthm vreated lp:bzr-grep :)11:06
parthmvila: :-) in that case we can probably reject the mp. i will raise a review request against lp:bzr-grep.11:07
vilabut adding more devs to it would be good... what the right team ? ~bzr ?11:07
vilaparthm: great11:07
parthmvila: will do.11:07
parthmso for lp:bzr-grep, should i just change 'maintainer' to bzr-core and add myself as 'driver'. so apart from bzr-core will i also have commit permissions.11:11
lifelessnot bzr-core11:15
lifelessbzr11:16
lifelessand you should be in bzr anyhow11:16
lifelessbzr-core is actually 'just bzr not plugins'11:16
lifelessits confusing11:16
parthmlifeless: ok.11:16
parthmlifeless, vila: done. 'bazaar developers' are not listed as maintainers for lp:bzr-grep.11:17
lifelessdon't set a driver either11:17
parthmlifeless: but won't i lose commit rights to lp:bzr-grep that way?11:18
lifelessjoin ~bzr11:18
lifelessdriver doesn't do what you might think it does11:18
lifelessit has no influence on commits11:18
lifelessthe url - lp:~TEAM/bzr-grep/branchmae11:19
lifelessthe TEAM there is what controls commits11:19
=== LenZGr is now known as LenZ
parthmlifeless: ok. looks like i lost the rights to change the driver of lp:bzr-grep maybe you could remove my name from there https://launchpad.net/bzr-grep11:20
parthmlifeless: so to join team bzr, do i send a message via "contact team's owner"?11:22
lifelessparthm: I've added it to the 'bazaar' project group11:22
lifelessparthm: no, you click the join this team link11:22
lifelessI've also added 'bzr plugin' to the description11:22
lifelessI hope thats ok11:23
parthmlifeless: sorry this is taking so long. i can't seem to find the 'join this team' link on https://launchpad.net/~bzr11:24
lifelessbah11:25
lifelessits set to restricted11:25
lifelessI'll talk to poolie about this friday11:25
lifelessfor now11:25
lifelesswhats your lp username11:25
parthmits parthm.11:25
parthmlifeless: looks like it worked. thanks for your help.11:31
parthmvila: the grep mp can probably be rejected, i will raise an empty one against lp:bzr-grep.11:32
vilaparthm: I think you can reject yourself (or something is broken otherwise), let me know if you can't (I'm curious)11:33
parthmvila: i can't seem to find a way to reject it. should it be listed in the "Review:" dropdown?11:36
vilaparthm: in the status at the top of the page11:37
vilaparthm: found it ? Click the little yellow pencil otherwise11:38
parthmvila: ok. that worked. thanks.11:38
vilaparthm: great !11:38
vilahaaaa, https://code.edge.launchpad.net/bzr/+activereviews done to 10 mps with 4 ready to land, go bzr devs :D11:39
parthmvila: cool :-)11:39
parthmvila, lifeless: thanks for your help. got to go. have a nice day.11:40
=== grahal_ is now known as grahal
davidstraussHow can I convert from svn to bzr and filter out some files?12:55
igcnight all13:08
=== mrevell is now known as mrevell-lunch
jelmerdavidstrauss: convert from svn to bzr first, then use fast-export/fast-import's filter-branch to remove those files13:30
parthmhello. i am trying to add binary support (ignore binary) to bzr-grep. https://bugs.launchpad.net/bzr-grep/+bug/53133613:30
ubottuLaunchpad bug 531336 in bzr-grep "bzr grep does not handle binary files cleanly" [High,In progress]13:30
parthmmy initial thought is to catch UnicodeDecodeError and print a message that its a binary file and move on to the next one.13:31
parthmi am not too familiar with unicode. does that seem like a reasonable fix?13:31
parthmit will certainly be faster than looking for \x00 in the first few lines.13:32
davidstraussjelmer: thanks :-)13:32
=== vds1 is now known as vds
parthmnevermind. i did the fix using textfile.text_file which is very convenient.13:56
=== mrevell-lunch is now known as mrevell
=== kirkland` is now known as kirkland
parthmvila: ping14:23
vilaparthm: pong14:25
parthmvila: hi. I am going through your comment 'I think we put new features into bzrlib.test.features instead.'  on https://code.launchpad.net/~parthm/bzr/262450/+merge/1948314:25
parthmdoes this mean i take the _PosixPermissionsFeature and the following assignment and move it to tests.features?14:26
parthmthere aren't any other classes there so i was a little confused.14:26
vilaparthm: yes. Sorry for that, as often when we change some coding rule we haven't apply that one in the whole code base14:27
parthmvila: ok. thanks for the clarification. i am closing the review comments now.14:27
parthmvila: i see lines like 'subunit = tests.ModuleAvailableFeature('subunit')'. does my code just to be moved (and Feature) class imported or do i need to do something more?14:30
vilajust move the code and update the imports so that the tests use 'features.PosixPermissionFeature'14:30
parthmvila: ok.14:31
davidstraussjelmer: How can I specify multiple exclude_paths? It's not anywhere in the documentation>14:34
jelmerdavidstrauss, I'm not myself familiar with bzr-fastimport/bzr-fastexport unfortunately :-?14:35
davidstraussHow can I get Paramiko to use a custom SSH private key location? (Not the default of .ssh/id_rsa or .ssh/id_dsa)14:39
luksdavidstrauss: does Paramiko even use .ssh/id_rsa/dsa?14:41
luksI thought it only supports the Putty key agent14:41
davidstraussluks: This is on Mac OS X14:41
luksoh14:42
lukswhy not use openssh then?14:42
davidstraussluks: I can.14:42
luksyou can set the key in ~/.ssh/config then14:42
luks(Host example.com\n    IdentityFile /path/to/private/key)14:44
MTecknologyThere's bzr-email. I read the help for it 'bzr help email' but I still don't understand how to set the configs it's referring to.14:46
MTecknologyhrm... Can I set those values in $HOME/.bazaar/bazaar.conf on the remote server?15:00
MTecknology* that I'm pushing the code to15:00
Raimif you can open a ssh session, yes...15:01
RaimI mean, a shell :)15:01
MTecknologyRaim: I mean for the bzr-email plugin. I don't know if I need that set local or remote; now that I know what file I need to set those in15:02
MTecknologyI suppose now that I have a clue I can just try it to :P15:03
=== khmarbaise_ is now known as khmarbaise
staniWhen i merge branch B into branch A and commit the changes to branch A, all the commits of branch B become one commit in branch A. Is there an easy way to transfer the commits of branch B as individual commits to branch A while merging?15:22
vilastani: the commits are still there as inidividual commits, try 'bzr log -n0'15:22
vilaor bzr qlog15:23
stanithanks, can i diff them?15:23
stanivila: thanks, I think i know how15:26
vilastani: bzr diff -caaa.b.c should do the trick once you get the revnos from the log (or clicking at the right place in qlog)15:29
bialixhi all15:35
bialixI have a question about hooks15:36
bialixthere is open hook15:36
bialixcan I setup new hooks from open hook?15:36
bialixsay, I have config in a branch which tells me about other hooks15:36
bialixthen I would like to setup in runtime required hooks based on this config15:37
bialixis it possible15:37
bialix?15:37
vilabialix: I don't think that's the expected usage15:41
bialixhi vila15:41
vilabialix: you install hooks and then you can tests whether they apply or not instead15:41
bialixI want to make universal hooks launcher15:41
vilas/can tests/can test/15:41
bialixbut I don't want to install every possible hook15:42
viladefine universal hooks launcher ?15:43
bialixI'm put the script into the tree under version control15:43
bialixand I need the way to laucnh this script on hook15:44
bialixsay I have python module in my tree with hook implementation15:44
bialixso I need only one plugin to install to launch this hooks15:44
bialixvila: is it make sense? or sound crazy?15:45
vilaa little bit of both so far :)15:46
bialixyep :-)15:46
thorikethorike> hey guys15:46
thorike* jelmer has quit (Ping timeout: 265 seconds)15:46
thorike<thorike> i get bzr launchpad-login thorsten-prante15:46
thorike<thorike> bzr: ERROR: Transport error: Server refuses to fulfill the request (403 Forbidden) for https://launchpad.net/~thorsten-prante/%2Bsshkeys15:46
thorike<thorike> what can i do15:46
vilaeach hook has a different signature at least so I don't see how you will address that to start with15:46
bialixvila: okay, say I have python module with hook function which conforms signature15:47
bialixscript won't fly, I see15:47
bialixthorike: lp is upgrading now, no?15:48
vilathorike: you may get better feedback from #launchpad where you already asked :)15:48
bialixhmm, it's planned to upgrade today but not yet, according to announce15:49
bialixvila: how can one define project-specific hooks?15:50
vilathorike: from the bzr side, I don't remember a 403 for launchpad-login, so I'd suspect a server -side thing15:50
bialixor better: branch-specific?15:50
vilabialix: by testing that they are invoked for a given branch15:50
thorikewhat abou bzr: ERROR: Invalid http response for http://bazaar.launchpad.net/~docky-core/docky/trunk/.bzr/repository/packs/2ff01fc6c27e6c04d7c95356fe08a608.pack: Missing the Content-Range header in a 206 range response15:51
bialixvila: e.g.?15:51
thorikevila, ^15:51
bialixthorike: are you using proxy?15:51
vilathorike: urgh, sounds like an intercepting proxy playing tricks at first glance15:51
thorikeyeah15:52
vilathorike: bzr branch  http://bazaar.launchpad.net/~docky-core/docky/trunk docky WFM15:52
vilaBranched 1165 revision(s).15:53
vilathat adds value to the proxy cause15:53
j^hi, is there a way to run loggerhead with loggerhead.conf and just auto_publish_folder15:54
j^the example just sets that for a subfolder15:54
thorikethanks guys15:56
thorikehad to reboot15:56
thorikewas proxy15:57
bialixwhat it means: repacking chk?15:57
bialixit seems pul from lp:bzr/2.1 triggers full repack of my repo, :/15:58
vilabialix: rejoice ! You now have a fully repacked repo :)15:58
vilabialix: how many packs in repository/packs ?15:59
bialixnow there is 2: one 90 big16:00
bialix90MB big16:00
=== salgado is now known as salgado-lunch
bialixit was it16:00
bialixso, vila: how can I check in the hook that I'm in the right branch/tree? any examples?16:00
vilabialix: sounds like a regular autopack to me16:00
vilabialix: not readily available but depending on the hook you should have some tree/branch/repo handy and from there you can get your hands on the config or xxx.base16:02
bialixright now I'm interested in MutableTreeHooks.start_commit16:02
vilaAAARGH ! Forgot dentist appointment  !16:03
bialixwow16:07
vilagrr, next available slot in 2 weeks :-/16:07
bialixoops16:07
bialixyou have not enough good dentist around it seems16:08
vilabialix: so MutableTreeHooks.start_commit has the tree as parameter, so you from it you check whether your hook should apply or not16:08
vilawell, once I *go* to the first appointment I'm in the loop and get new ones quicker, that's first time I have to wait so long though16:10
MTecknologyis smtplib build into python?16:12
bialixMTecknology: yes16:13
bialixMTecknology: err, no16:13
MTecknologybialix: I'm still trying to figure out bzr-email; I got side tracked16:14
* mrjazzcat is away: Auto-away after 30 mins idle (gone at 3rd Mar, 09:22:12)16:22
=== mrjazzcat is now known as mrjazzcat`afk
=== mrjazzcat`afk is now known as mrjazzcat
MTecknologyI put this configuration on ~/.bazaar/bazaar.conf on the server that I'm pushing code to http://dpaste.com/167394/. I just pushed a new revision to is but no email was generated.16:26
MTecknologyI just looked in /var/log/mail.* and there's nothing that seems to be trying to get through.16:28
bialixvila: still here?16:30
=== LenZ is now known as LenZ|brb
=== beuno is now known as beuno-lunch
=== LenZ|brb is now known as LenZ
=== radoe_ is now known as radoe
bialixvila: it works16:57
vilagreat !16:57
MTecknologyI'm not even finding the docs I need to figure out how to make this work...17:00
=== salgado-lunch is now known as salgado
=== jam1 is now known as jam
cody-somervilleIf I have a checkout, what is the location alias for the remote branch? ie. I'm trying to find out the revno so want to do something like: bzr revno :checkout17:39
james_wdoes :bound work?17:40
cody-somervilleyes :)17:41
cody-somervillety17:41
MTecknologyAny ideas about that email question above?17:43
jasonlifei'm using NFSv4 and keep getting "bzr: ERROR: [Errno 5] Input/output error" after some bzr command..  Actually the command seems to work tough..17:45
jasonlifeI noticed bzr problem with NFS, but couldn't find fix..17:45
jasonlifeanybody have idea on NFS and bzr issue?17:46
=== jelmer_ is now known as jelmer
jamjasonlife: the only 2 problems I've seen are18:10
jam1) stuff with bzr-svn/git/hg because of using TDB which doesn't like NFS18:11
jam2) We use a OS level file-locking, and sometimes that isn't enabled on NFS18:11
jamone solution to (2) is to use local working trees with NFS branches and repos18:11
jasonlifeI'm using NFS for my home directory and my local copy is in my home directory18:12
jamk, so you'll probably need to make sure that NFS locks are properly set up.18:12
jamBut I don't really know how to do that18:12
jasonlifeAre there any side effects of the error?  I have used bzr for one days so far, everything seems working fine even if I got the error18:13
jamI'd have to see the actual failure to tell you any more18:13
jamthat specific error doesn't quite match what I would think the locking would be18:13
jasonlifeYou mean NFS locks in my NFS server for my home directory?18:14
jamjasonlife: right18:14
vilamorning jam !18:14
vilajam: quick question before I quit18:14
vilajam: branchbuilder doesn't support symlinks right ?18:14
jamhey vila18:14
jamIIRC, no18:15
jamwe could add it18:15
vilajam: or rather, it *looks* like it supports adding them but not modi... ok, yeah, I'll do that18:15
jamthough I don't think MemoryTree supports them either18:15
vila:-(18:15
jamwell, not well18:15
jamat lesat18:15
jamleast18:15
vilawell, time to add them there too :)18:15
vilaok, I'll look into it tomorrow...18:16
=== chx_ is now known as chx
jasonlifejam: http://pastebin.com/bUMuuehZ18:16
jasonlifethis is the error I got in .bzr.log18:16
jamso, that does look like it is a locking issue.18:17
jamGiven the location18:17
jamI would guess it is normally harmless18:17
jamWe keep track of the current sha value for a file, and track it against the mtime. That looks like it is a failure to update that18:18
jamwhich means we will re-read the file later18:18
jamwhich isn't a problem.18:18
jamIt is *possible* that you could get a failure during 'bzr add'18:18
jamwhich would then forget that a new file was added18:18
jambut most failures are a 'repeat the command' away. I wouldn't expect corruption from it.18:18
jasonlifeI see18:18
=== beuno-lunch is now known as beuno
gavenkoaHi! I have issue on bzr pull. When pull done on emacs source it gets 4 MiB inet traffic! When I search diff and compress it I got only 10 KiB! Why so mach inet traffic used by bzr client?18:29
gavenkoahttp://pastebin.com/i6nXw15n18:29
KinnisonPresumably because you're not using the smart protocol; so it has to fetch indexes etc to work out what diffs it needs to fetch18:47
gavenkoaKinnison: OK, that protocol use?18:53
KinnisonIt would rely on the emacs people having set up the smart server18:53
KinnisonIf they've not published how to use it; then they haven't18:53
gavenkoasftp is ok?18:53
Kinnisonsftp is just as bad18:53
Kinnisonbzr+ssh:// is better18:53
gavenkoa((18:54
gavenkoaI post bug https://bugs.launchpad.net/bzr/+bug/25294518:54
ubottuLaunchpad bug 252945 in bzr ""bzr push" uploads 1-2 MB just to send a one-line change revision" [Undecided,Fix released]18:54
KinnisonYour comment really didn't belong on that bug18:59
KinnisonYour bug is "When pulling from HTTP, a 10KiB diff transferred 4MiB of data"19:00
KinnisonNot "When pushing...."19:00
MTecknologyI'm still not getting it... for bzr-mail to work, does it have to be client side instead of server side?19:02
gavenkoaKinnison: sorry ((19:17
jasonlifeIs there bzr command to list the files that are not part of bzr project?19:18
gavenkoabzr st | grep "^\?"19:18
lifelessbzr ls --ignored --unknown -R19:19
jasonlifelifeless: thanks.. it works..19:20
jasonlifeis "*.o" file the "ignored file" ?19:21
lifelessyes19:22
mtaylorbzr tags is showing me crap19:24
mtaylorlifeless: http://pastebin.com/qBxVcwfz19:25
mtaylorlifeless: the tags with ? listed are from other projects...19:25
lifelessyes.19:26
lifelessyou merged them into your tree. Don't do that.19:26
jasonlifeI'm wondering how mtaylor merged tags from other projects..19:29
* mtaylor also wonders that19:29
lifelessmtaylor: the bzr merge command probably ;P19:41
* mtaylor pokes lifeless in the eye19:41
lifelessits possible that it merges under mistake circumstances; in which case please file a bug19:42
lifelessmtaylor: I need these eyes... to use my awesome new lappy19:42
mtaylorlifeless: cool19:42
luke-jrjust found a large history of a project that I imported into Bzr... is it possible to prepend that history to my repository?19:49
ahordenhey all, what is the max size of file I can store in bazaar?20:00
mtaylorabentley: pipelines question... is there any way that I'm not finding to do bzr lp-submit on the whole pipeline at once? Also - is there any way do bzr push on each pipe in the pipeline at once ... or do I need to move through the pipeline and do each pipe in turn?20:01
lifelessahorden: pragmatically, about 1/3 your physical memory20:01
ahordenI have a 3.8G database dump I want to keep in revision control, and I keep getting bzr: ERROR: exceptions.OverflowError: signed integer is greater than maximum20:01
ahordenlifeless, box has 8 gig of memory at the moment20:02
lifelesscode wise we should be 64-bit safe; if not please file a bug20:02
abentleymtaylor, there isn't currently a way to submit all pipes at once.20:02
lifelessahorden: are you running a 64-bit kernel and userspace ?20:02
bialixahorden: most likely you have 32-bit version of python?20:02
mtaylorabentley: cool. at least i'm not just stoopid20:02
lifelessmtaylor: he didn't say that :P20:02
* mtaylor pokes lifeless in the eye20:02
ahordenPlatform: Linux-2.6.31-19-server-x86_64-with-Ubuntu-9.10-karmic20:02
lifelessahorden: please run 'ubuntu-bug bzr' then, and give us a bug report. Let us know the number and I'll promote it to upstream right away20:03
bialixahorden: run `python` and check the first line20:04
ahordenlifeless, I was about to upload this http://dev.biological-hazard.net/~adhorden/bzr-20100303195926-10714.crash its the crash report might help you debug better20:05
MTecknologylifeless: any chance you could help me with bzr-email? I've been looking. I feel like I'm retarded for not finding information about it beyond 'bzr help email' and where to set the config.20:05
lifelessMTecknology: what version of bzr-email do you have?20:05
lifelessMTecknology: and what do you want to do with it?20:05
MTecknologylifeless: On the server I have a user account with this config [http://dpaste.com/167394/] on that user account. I'd like it to be that if anyone pushes new code to any branch there an email gets sent to the devs.20:08
ahordenlifeless, I would do a bug report if Launchpad would let me log in!20:08
lifelessahorden: #launchpad should be able to help you with that20:08
MTecknologylifeless: 0.0.1~bzr420:09
lifelessMTecknology: that doesn't look like a version I've ever seen packaged20:10
lifelessrmadison bzr-email20:10
lifeless bzr-email | 0.0.1~bzr40-1 | lucid/universe | source, all20:10
lifelessdo you mean that ^ ?20:10
MTecknologysorry, ya20:10
=== BasicPRO is now known as BasicOSX
MTecknologyrunning on karmic; same version - just had part of it chopped off20:11
lifelessMTecknology: so, you've read bzr help email ?20:13
ahordenlifeless, is the crash report any good?20:13
lifelessahorden: I don't know, please file it as a bug20:13
* lifeless is already in the middle of prepping breakfast, helping MTecknology, writing an email20:14
MTecknologylifeless: ya, the config seems easy enough; it took looking aroundto figure out I need to put that in $HOME/.bazaar/bazaar.conf20:15
lifelessMTecknology: you'll want it in .bzr/branch/branch.conf20:15
lifelessMTecknology: as different user accounts might not have the config otherwise.20:15
MTecknologylifeless: OH!20:15
MTecknologylifeless: can I put that in on the server side or how should I put that in the branch?20:16
ahordenlifeless, thanks bug will have to wait maintainance tonight on launchpad20:16
lifelessthis is covered (although it could be clearer) in 'bzr help configuration'20:16
lifelessahorden: ok20:16
lifelessMTecknology: the servers copy of the branch, the server can't see the client side branches ;)20:17
MTecknologylifeless: parent_location is kind of odd to have considering it's where I pushed to it from. What happens when somebody else pushes code to it from a different location?20:19
lifelessnothing20:19
MTecknologythat just deals with where the branch was created from?20:20
lifelessits just the default for 'pull' or 'merge' in that branch20:20
lifelesssee bzr help configuration20:20
MTecknologyok20:20
MTecknologylifeless: what would you suggest using for sending email? Could I just use sendmail?20:24
lifelessMTecknology: use whatever you like20:24
MTecknologytime to see if this works now...20:29
jelmerjam: fwiw we don't require TDB for bzr-hg/svn/git, we can also use sqlite (which might has the disadvantage of only allowing one concurrent writer)20:30
MTecknologylifeless: I tried that in the file you mentioned; just added it to the end of the file using email = Kalliki Private Devs <dev-private@kalliki.com>20:31
MTecknologyeditor = /usr/bin/vim20:31
MTecknologypost_commit_to = dev-private@kalliki.com20:31
MTecknologypost_commit_difflimit = 4000020:31
MTecknologyoopss... sorry20:31
lifelessdid you see the bit 'By default bzr-email only emails when a commit occurs,...'20:32
MTecknologyya, I made a commit and pushed it to the server20:32
MTecknologyoh... that's for local commit; it only knows I push- doesn't it?20:33
lifelessright20:33
lifelessthe server can't tell 'commit' from 'push' or 'uncommitt20:33
MTecknologylifeless: I'm guessing this is working mostly.. It doesn't want to let the user use sendmail - I guess I'll try to allow the user to do that20:38
lifelesswhat do you mean20:39
lifelessI hesitate to ascribe an intentional stance to your server.20:39
MTecknologyI have sendmail installed; I guess by default normal users can't use it20:39
lifelessuhm20:40
lifelessmost folk use 'mail' not sendmail to queue mail for delivery.20:40
lifelessqueuing and internet transferral are very different things.20:41
MTecknologywhat package is that?20:41
lifelessyou may have it already20:41
lifelesstry typing 'mail'20:41
MTecknologynope20:41
MTecknologynot found20:41
lifelesswell, there are lots of packages20:41
lifelessmost MTAs include a mail program20:42
lifelessI can't really comment  on sendmail per se20:42
lifelessyou don't need an MTA on the machine though, bzr can use an SMTP server20:42
MTecknologywhat would you choose to queue the message?20:43
lifelessI use the default, which is to run the mail program20:43
MTecknologymailx; alrighty20:45
mwhudsonjelmer: hey, did you see my bzr-svn merge proposal?20:46
mwhudsonno hurry, just wanted to make sure it didn't fall through the cracks20:46
MTecknologywell - I like this error more - bzr: ERROR: mail is not installed20:47
lifelessMTecknology: well, whatever you want again. 'mail' is largely a standard, there are options to tweak how bzr-email uses it. My /usr/bin/mail comes from bsd-mailx20:49
MTecknologylifeless: I just installed bsd-mailx assuming that was the right one; which mail gives me /usr/bin/mail; when I push I get that error20:52
MTecknologylifeless: but if I'm that user and I run 'mail' I get 'No mail for kalliki'20:52
lifelessMTecknology: 'mail -s test your-email@gmail.com'20:53
lifelesstype type type20:53
lifelessctrl-D20:53
lifelessor you could use smtp20:53
lifelessor whatever :P20:53
MTecknologyok odd, I get "bzr: ERROR: mail is not installed !?" after a push; but the message still winds up in my inbox20:54
lifelessMTecknology: run with -Derror20:55
MTecknologylifeless: http://paste.ubuntu.com/387847/20:57
lifelesswe're getting ENOENT21:00
lifelesson your workstation21:00
lifelessdid you install the plugin locally?21:00
MTecknologyIt's both local and remote21:00
lifelesswell, then you'll probably want to install mailx on the workstation21:00
lifelessor don't install it there.21:00
MTecknologyok21:00
lifelessbzr is running the plugin locally and its erroring21:01
MTecknologyoh21:01
MTecknologylifeless: awesome :D now... is it possible to change the subject of the email?21:02
lifelessnot currently21:03
lifelessthere might be patches unmerged, I'm not sure21:03
MTecknologyawesome21:04
MTecknologylifeless: thanks for the help :D21:04
MTecknologyawesome plugin :D21:04
lifelessde nada21:04
=== BasicPRO is now known as BasicOSX
drewwwI'm having trouble checking out just part of a tree from a bzr repository on launchpad - can I not do "bzr branch lp:projectname/path/to/file"?21:14
bob2correct21:14
bob2the only common vcs to support that is svn, afaik21:15
lifelessand cvs21:15
drewwwhuh21:15
=== salgado is now known as salgado-afk
drewwwSo how should I work around this? It's making deployment for this web service tricky.21:17
lifelessyou can use views21:18
lifelessbut that doesn't quite do the same thing21:18
drewwwhmm21:18
lifelesswhy do you need to deploy?21:18
drewwwIt's a web app thing21:18
drewwwI'm using a framework that I Can't distribute21:18
drewwwso I just have the "app" folder in my repository21:18
drewwwand to deploy, need the app folder to be at the same level in the web server's webroot as the framework's files.21:19
lifelesswhy not have your repository root /be/ the app folder21:19
drewwwyeahhhhhhh starting to think that would have been the right choice, but I had an installation instructions file at the same level as app21:19
drewwwwhich was how I used to set stuff up with svn21:20
drewwwold habits die hard21:20
ahordenlifeless, one bug https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/53161221:22
ubottuLaunchpad bug 531612 in bzr "ERROR: exceptions.OverflowError: signed integer is greater than maximum" [Undecided,New]21:22
jelmermwhudson: hi21:28
jelmermwhudson: yep, I saw it21:28
mwhudsoncool21:28
jelmermwhudson: I have some concerns, will reply today21:28
mwhudsonjelmer: ok21:29
=== Chex changed the topic of #bzr to: Bazaar version control | Launchpad will be down/in read-only from 23:00 UTC until 00:30 UTC for a code update | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: vila | bzr 2.1.0final has gone gold, time to build installers!
mwhudsonjelmer: i see what you meant by bzr-svn's tests being better than bzr-git's being better than bzr-hg's :-)22:18
jelmermwhudson: :-)22:26
mwhudsonjelmer: HgWorkingTree.commit() doesn't seem to create a revision that has the current tree tip as a parent22:53
mwhudsonjelmer: is that "yeah, we know", "oh, that's surprising" or "meh" ?22:54
jelmermwhudson: yeah, we know :-)22:55
jelmermwhudson: the working tree support in bzr-hg is, uhm, experimental22:56
jelmerif it works, I'm surprised too22:56
mwhudsonjelmer: it's kind of a shame that the pull tests use it to set up the test cases then?22:56
jelmermwhudson: it uses commit as well?22:56
jelmerare you sure it doesn't just use the hg API directly?22:57
mwhudsonjelmer: yeah22:57
mwhudsonjelmer: look at tests/test_pull.py:34 ish22:57
mwhudson(i was a bit surprised to see this!)22:58
thumperhow do you use bzrlib to add a file, or update a file if there is no working tree?23:19
thumperactually if a file exists, I want to merge it in if it is text and replace if it is binary23:20
mwhudsonthumper: you can23:23
mwhudson't merge or commit or anything without a tree23:23
mwhudsonyou can do this stuff in a preview tree though, i guess?23:23
thumperinteresting23:24
distaticaI'm having a problem commiting to lp after a checkout, I get a Invalid url supplied to transporter error: http://paste.pocoo.org/show/185320/ am I missing something obvious?23:30
distaticawait, that doesn't have me with the issue on commit, just checkout, I had another checked out branch and I tried commiting wtih the same error.23:31
mwhudsondistatica: launchpad code hosting is down for a rollout right now23:37
distaticaoh I see23:50
jelmermwhudson: I've merged your patch but changed the way in which limit is used23:54
jelmermwhudson: The reason for this is that a pull from an out of date branch should be a no-op unless --overwrite is specified23:54
jelmermwhudson: unfortunately I can't push atm, launchpad being down temporarily and all :-)23:55
mwhudsonjelmer: awesome23:56

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