/srv/irclogs.ubuntu.com/2008/10/16/#bzr.txt

spivAh, "bzr missing --theirs :bound" is slightly simpler.00:04
fullermdOh look, another layer violation...00:13
=== arjenAU2 is now known as arjenAU
davidstraussfullermd: layer violation?00:20
fullermdOh, it's another log on a long-standing gripe of mine.00:23
nbjaymehello folks.  my repository has grown. is there a way to have bzr flush the rest of the revisions?  from revision 1 to 68 and i want to flush revisions 1 to 30... that'll end my repository to have only from revisions 31 to 68.   ?02:13
ferringbnbjayme: why do you want this?02:13
ferringbkind of defeats the purpose of a vcs if you're chucking out history02:13
nbjaymeokay okay....  probably i worry too much of diskspace.  :) he-he02:14
ferringbnbjayme: if you're talking thousands of revs, sure02:15
ferringbalthough personally that's still pretty small, at least for the repos I deal w/.  either way, look into the pack command02:15
lifelesspoolie - split inv fetching mysql down to under 1sec/rev02:16
lifelessnbjayme: how big is your tree?02:16
jmllifeless: can you please give me permission to set priorities on testresources bugs?02:18
lifelessnbjayme: I'd be bothering with that at the 100's of thousands of files & revisions02:18
lifelessjml: whats the metaproject called?02:19
jmllifeless: pyunit-friends02:19
nbjayme@ferringb... no not really that large.... i just want to make it minimal to lessen some bandwidth transfer.  @lifeless, pretty small i would say....02:19
lifelessnbjayme: deleting history like that is *possible* but it will not result in a significant bandwidth reduction because texts are delta compressed02:20
nbjaymelifeless... okay.... i'm still around 8mb though..  :)02:21
lifelessjml: I've put it in pyunit-friends, that may have done it?02:21
lifelessnbjayme: how are you measuring that?02:21
nbjaymei go to nautilus and righ-click on the .bzr directory....02:21
lifelessnbjayme: that figure doesn't represent what is transferred02:21
bob2nbjayme: are you often copying the whole repository, or just updates?02:22
lifelessnbjayme: there are transactional details that are not copied, and incremental pulls only copy new content anyway02:22
jmllifeless: thanks, let's see.02:22
nbjaymethe project is small, i'm still going to upload it in launchpad... :-)  just wanna be a good netizen... he-he. yes, transfers to repo are faster after the initial commit or push. :)02:24
jmllifeless: nope. There's no such thing as a driver or bugs supervisor for super-projects.02:24
jmllifeless: the thing to do is make a team with you and I in it and set it as the bugs supervisor (or appoint me project maintainer, whichever works)02:24
lifelessgarh02:25
lifelessso complex02:25
lifelessjml: I think I'd like to stay as maintainer :P02:26
jmllifeless: de jure at least02:26
lifelessjml: of the day?02:26
jmllifeless: "by law". often contrasted with "de facto"02:27
jml:P02:28
lifelessoh right02:28
lifelessarchitecture astronauts R us02:28
lifelessjust filed my LP bug for the day02:28
jmlheh heh02:28
lifeless(bug supervisor field requires a precreated team)02:29
lifelessjml: https://edge.launchpad.net/~testresources02:30
jmllifeless: I've joined, moderate me please.02:31
lifelessdone, you are now moderate02:33
jmllifeless: thanks.02:34
* jml is born to be mild02:34
jmllifeless: we're saying that a commit to trunk is a release, right?02:35
lifelessjml: yes02:35
lifelessjml: 'early and often'02:35
lifelessjml: can't get more early than every commit :P02:35
* jml spams lifeless with bug mail.02:37
lifelesstoo late02:37
lifelessyou already did02:37
ferringbcurious; fixing tracbzr, one thing I did was yoink out the revno in favor of revision_ids (will add revno at some point, but it complicates it); problem being, that's chunks of an email address most of the time.  how are others handling the scraping potential there?02:37
ferringb...aside from just using revnos instead02:37
jmllifeless: this is round #2 :)02:38
lifelessferringb: not sure02:40
lifelesspoolie_: I've put the usertest order back - because the numbers are a *lot* easier to read in the order I put together last week02:40
poolie_ok02:42
poolie_did you kill it too?02:42
lifelesspoolie_: eys02:42
lifelesspoolie_: fingers crossed .inv will be 'fast enough' now02:42
lifelessits about 0.8sec/rev for me now02:43
poolie_did you kill it twice or more?02:43
lifelesson my laptop02:43
lifelessyes02:43
poolie_it looked like it disappeared a while ago i was just trying to work out why :/02:43
lifelesstwice, once when I pushed my branch, and then again when I saw it skip .inv02:43
lifelesssorry for any panic :)02:44
lifelessbbiab02:56
poolie_woo, python compiled the extensions on kerguelen03:17
poolie_and selftest is running03:17
lifelesspoolie_: its pulling much faster; 1.7G used so far :P04:17
lifelesspoolie_: previously that took a day or so04:17
poolie_great04:17
jmlspiv: hi04:21
jmlspiv: tell me where the smart server does error translation.04:21
jmlI have a bug that needs a-filing.04:21
* jml finds it manually04:22
spivjml: look at the bottom of bzrlib/remote.py04:23
spivjml: that's where is mostly happens on the client side (although there's also some in bzrlib/transport/remote.py).04:24
jmlspiv: I get this when I push to a non-existent product on Launchpad: bzr: ERROR: Generic bzr smart protocol error: Permission denied: "Project 'no-such-product-xxx-flibble-ai-po' does not exist."04:27
jmlspiv: I have 99% confidence that we are raising an honest-to-goodness PermissionError from the bzr running on the server.04:28
spivjml: which verb does -Dhpss reveal that to be in reply to?04:28
spivHmm, maybe BzrDir.open?  There's a bug open about that one, I think.04:29
jml5.217  hpss call:   'mkdir', '/~jml/no-such-product-xxx-flibble-ai-po/branch', ''04:30
jml5.217               (to bzr+ssh://bazaar.staging.launchpad.net/%7Ejml/no-such-product-xxx-flibble-ai-po/branch/)04:30
jml5.569     result:   ('error', 'Permission denied: "Project \'no-such-product-xxx-flibble-ai-po\' does not exist."')04:30
spivjml: (https://bugs.launchpad.net/bzr/+bug/278673 is the bug I was thinking of)04:31
ubottuLaunchpad bug 278673 in bzr "Traceback when uploading to an invalid location" [High,Confirmed]04:31
mwhudson_note that launchpad doesn't need to be involved04:31
mwhudson_$ bzr push bzr+ssh://localhost/bob04:31
mwhudson_bzr: ERROR: Generic bzr smart protocol error: Permission denied: "/bob": [Errno 13] Permission denied: '/bob'04:31
spivjml: that's not a PermissionDenied error on the wire, that's a generic 'error'.04:32
jmlspiv: interesting04:32
spivjml: so the problem is server-side.04:32
jmlmwhudson_: also interesting.04:32
spiv(and quite possibly still in bzrlib)04:32
spivjml: bzrlib.smart.request.SmartServerRequest._call_converting_errors is probably the culprit04:33
jmlspiv: looks plausible.04:34
spivjml: in fact, it appears that currently the only place that encodes a PermissionDenied error is an explicit except in bzrlib.smart.vfs.GetRequest04:34
jmlspiv: how many places does one need to list an error before it gets translated properly?04:35
* jml finds https://bugs.edge.launchpad.net/bzr/+bug/24679204:36
ubottuLaunchpad bug 246792 in bzr "permissiondenied not translated on creating branch over bzr+ssh" [Undecided,Confirmed]04:36
spivjml: Ignoring tests, typically three.04:36
jmlspiv: that seems like at least one place too many04:36
spivjml: server side, client-side vfs, client-side non-vfs.04:36
spivThe latter two can probably be unified somewhat sanely now.04:37
LinuturkI've kinda followed the mini tutorial, but I've got a question. I created a branch on my laptop, and then pushed that to my personal sftp server05:32
Linuturkbut, none of the files are showing up on the server05:32
Linuturkideas?05:33
Linuturkthere is a .bzr directory on the server though05:33
Linuturkjust, no files in the project folder05:33
mwhudsonLinuturk: pushes to a remote location don't push a working tree too05:36
mwhudsonLinuturk: the push-and-update or 'upload' plugins might be what you want05:36
mwhudson(or maybe you shouldn't care, the .bzr directory contains enough to share the branch)05:36
Linuturkhmmm, so, if my laptop died, would the files be safe?05:37
Linuturkor, is my laptop considered the primary repo05:38
Linuturkand, the other links just point to it?05:38
mwhudsonno05:38
mwhudsonthe .bzr folder contains the complete history of the branch05:38
mwhudsonif you go to the server and run 'bzr co'05:39
spivLinuturk: the files would be safe.  The .bzr directory contains all the data.05:40
* Linuturk quietly installs bzr on the server first05:41
Linuturklol05:41
spivLinuturk: you can do "bzr log" or "bzr branch" or "bzr checkout" etc from that remote location.05:41
Linuturkooo, what's the bzr co ?05:42
Linuturkcheckout?05:42
Linuturko sweet05:43
Linuturkand, that pulled from the local .bzr05:43
Linuturknot my laptop05:43
LinuturkI'm looking to use bzr to control system configs on my servers05:43
Linuturkand, it seems like this will work great05:44
Linuturkthat sound good?05:45
poolie_it does06:52
vilahi all !07:07
jmlhello.07:08
spivSometimes I think it'd be nice to be able to make a loom post hoc from a series of commits.  So I could just start hacking on a non-loom branch, then go e.g. "loomify --base-from ancestor::submit", and get a loom with a thread per commit.07:29
spivWell, by "sometimes" I mean "just now" :)07:29
vilaA *thread* by commit ? Wow, care to give a bit more context ?07:30
spivvila: the use case I have in mind is where I've just started hacking without being sure in advance what shape it'll take, or how far I'll want to go.07:30
spivvila: so I do something interesting, commit it, do some more, commit, etc.07:31
spivvila: and then I start thinking "this would make a nice series of changes to submit for merging, but I'd like to tweak some of the earlier steps"07:31
spivIf those steps were already in a loom, then I'd be set, but in this case I didn't have that foresight.07:32
vilaSo certainly you want somme commitS in the same thread no ?07:32
spivBut if I could trivially make a loom pre-populated with threads based on my commits, then I wouldn't need the foresight.07:32
spivSure, probably.  But it's easy to collapse threads.07:33
spivIt's harder (not impossible, just not as easy) to split a thread.07:33
vilaI learn recently and with a bit of pain that combine-thread is more detructive than I thought07:33
spivThat's true, but that's a separate problem :)07:33
vilaSo how do you collapse threads then ?07:34
spivvila: "bzr combine-thread"07:36
spivvila: e.g. if I have commits r1, r2 and r3, and corresponding threads t1, t2, t3, then from inside t2 "bzr combine-thread" will leave me with t1, t3.07:37
vilaI'd like at least a warning there when I'm about to shoot in my foot :)07:37
Mezspiv, sorry, havent been able to get round to the whole bzrssh thing yet... it is on my todo list though07:38
spivvila: sure, or at least an easy way to unshoot the foot07:41
AfCMmmm. Self-inflicted wounds.07:42
vilaI think my use case was: r1, r2, r3 in threads t1, t2, t3, then in t2, add r4, combine-threads, boom, r4 is gone07:42
lifelessvila: spiv: patches, appreciated, kthx07:46
spivvila: right.  I think it ought to require a --force when a combine-thread will lose a revision not merged in later threads.07:46
vilalifeless: things would more easier if the loom test suite was passing :-/07:47
lifelessspiv: bzr create-thread; bzr pull . -r thread:<dead-head>07:47
vilabe even07:47
lifelessvila: abentley has fixed that07:47
spivlifeless: I know, just thinking out loud before I start hacking on a new idea.07:47
vilalifeless: huh ? bzr missing lp:~bzr-loom-devs/bzr-loom/trunk : Branches are up to date.07:50
viladamn lp:~abentley/bzr-loom/stuff07:51
vilawhy isn't that merged in trunk ?07:51
poolie_hi vila08:12
abentleyvila: wait, you're cursing me for fixing stuff?08:21
vilaabentley: Surely not !!! I didn't think you were online ! THANKS A TON :_08:21
vila:)08:22
abentleyvila: of course, I *shouldn't* be online.08:22
abentleyBut you used my nick, so I'd have seen it in the morning.08:23
vilahehe, I didn't realized there was 'damn' and 'abentley' so close :)08:24
vilaabentley: I was willing to review your user stuff but jam beat me to it :) (let's bring him into this too ;p)08:24
abentleylol08:25
vilaspiv: just notice your --force remark, agreed08:26
vilaabentley, lifeless, spiv: so what's the policy to bring remarkable abentley work merged into trunk ?08:26
vila:-)08:26
abentleyspiv: I kinda want that thread-per-commit thing every now and then.  But usually I just want to split a thread at a given revision.08:28
abentleyspiv: So given r1, r2, r3 in a thread, I want to create a new thread with r3 and change the existing thread to have r2 as its head.08:29
abentleyspiv: Which is doable, if a bit annoying.08:29
spivabentley: yeah, that would be good.08:52
poolie_hi spiv09:32
a_c_mi need a nudge in the right direction... i have checkouts via bzr:/localhost working, but want to only be accessible over ssh - any tips / links?11:23
=== Pilky_ is now known as Pilky
vilaabentley: ping13:17
vilaI'm just pushing a trivial branch at lp:~vila/bzr/2843443-docfix13:18
vilasudden;y bzr says: Using default stacking branch /~bzr/bzr/trunk at bzr+ssh://vila@bazaar.launchpad.net/%7Evila/bzr/13:18
abentleyvila: pong13:18
vilaHurrah, did I think, automatic stacking !13:18
vilaBut then the push seems to take as long as usual...13:18
vilaShould I file a bug ?13:18
vilaOr did I misunderstood something ?13:19
abentleyvila: Are both the branch and repo in 1.6 format?13:19
abentleyscratch that.  Yes, it should be giving you auto stacking, and shouldn't take as long as before.13:20
vilabran/format: Bazaar Branch Format 6 (bzr 0.15)13:21
vilaand the message is strange, what is '/~bzr/bzr/trunk' ?13:21
vila*I* suspect it's on launchpad, but yet13:21
abentleyvila: it's a host-relative path.13:22
vilawhat host ? mine ? launchpad ? the target branch's  ?13:23
vilaohhh, you mean an hpss one and it doesn't know its name ?13:23
abentleyvila: We stack on /~bzr/bzr/trunk rather than bzr+ssh://vila@bazaar.launchpad.net/~bzr/bzr/trunk so that it works over all protocols.13:24
abentleyIt is relative to the target branch.13:24
vilaHa, some problem than yesterday, or related at least13:24
vilafor clarity it would be nicer if the host was specified or even the url used internally no ?13:26
abentleyvila: It's basically a question of precision vs accuracy.13:28
abentleyThe value we are writing to branch.conf is literally /~bzr/bzr/trunk13:29
abentleyIf we change it the way you're suggesting, then we can't tell from that message whether it will work over multiple protocols.13:29
vilaI see13:29
vilaHow about "Using stacking branch /~bzr/bzr/trunk from branch.conf" or something ?13:30
vilaand I stop there :)13:31
abentleyvila: You mean "Writing stacking branch /~bzr/bzr/trunk to branch.conf"?13:31
vilawow, you mean this message is emitted when writing branch.conf ?13:32
vilaif that the case, yes13:32
vilaI will be happy with that, more even as it make it clear that lp is doing it13:32
james_wit's doing that on the host? If so, I think stating that might be good.13:33
abentleyjames_w: No, it's not.13:34
james_woh, ok13:35
abentleyvila: lp is not doing it.  bzr is doing it.  lp is just providing a file that suggests a location.13:35
abentleyvila: the choice to follow lp's suggestion is made by bzr.13:35
vilawhat is the file name you're referring to ?13:36
abentleyvila: bzr+ssh://abentley@bazaar.launchpad.net/%7Ebzr/bzr/.bzr/control.conf13:39
abentleyor for the branch you're pushing,  bzr+ssh://bazaar.launchpad.net/%7Evila/bzr/.bzr/control.conf13:41
Odd_BlokeIs there a way to set the parent of a branch from the UI, without having to do a ``bzr foo --remember``?13:43
james_wOdd_Bloke: if you count vim as a UI13:46
Odd_BlokeIt seems like there should be a way to do it, but I'm not sure to what extent we want to avoid people editing the config files under .bzr...13:48
vilaIt would help if you tell us *why* you feel that need just now13:53
vilaBecause ISTM that you need to do that *before* issuing a bzr command which may be laking the --remember option :)13:54
abentleyvila: You say about AuthenticationConfig._save: "Save the config file, only tests should use it for now."14:07
abentleyvila: Is that because it's not atomic?14:08
vilaNot more nor less than other config, but the true reason was because bzr never modifies it14:09
vilaAre you working on that right now ?14:09
Odd_Blokevila: The upstream location has moved, and the user wants to do this while they're doing the move, rather than next time they actually want to perform an operation.14:21
Odd_Blokes/upstream/parent/14:21
vilaOdd_Bloke: I see14:23
abentleyvila: Yes.14:25
vilaabentley: ok, I'll work on something else then, I'm looking at your previous patch anyway14:26
abentleyvila: As I mentioned to jam, we might want to support different authentications for sftp and bzr+ssh eventually.14:28
vilaI didn't see that, can you explain why, it sounds strange14:30
abentleyvila: Well, we support different authentications for other protocols.14:31
vilayou can already differentiate on port or on path14:31
abentleyvila: http and ftp can also be differentiated on port.14:32
vilasure, all schemes are handled the same14:33
vilabut sftp and bzr+ssh really use ssh14:33
vilaand the remote host will handle them with the same authentication14:33
abentleyvila: But is that an implementation detail?  Is "sftp" not a more obvious scheme for controlling sftp?14:33
vilahmmm14:34
abentleyI know that for launchpad, it will be convenient to specify 'ssh'.14:35
vilaI don't want users to define the same settings for sftp/bzr+shh or http/bzr+http14:35
abentleyI'm not proposing replacing 'ssh'.14:37
* vila hopes jam is not around and catch bzr+ssh typo...14:37
vilaWhat are you proposing ?14:37
vilathat sftp and bzr+ssh are handled as ssh aliases ?14:37
abentleyI'm saying that one day, we may want to support "sftp" and "bzr+ssh" as additional schemes in authentication.conf14:38
vilaI don't understand what that means14:39
vilaCurrently we use auth.get_user('ssh',  will that change ?14:39
abentleyvila: Yes, it would change to if auth.get_user('sftp...) is None: auth.get_user('ssh'...)14:40
vilaDo you have a need to specify, for the same host, different credentials or do you just want to be able to use sftp/ssh/bzr+ssh in the authentication.conf file interchangeably ?14:43
abentleyvila: Neither.14:44
vilaSo what ? >-<14:44
abentleyIt would not make sense for bzr+ssh to affect sftp.  It would not make sense for sftp to affect bzr+ssh.14:44
vilaIt makes sense to specify only once the credentials that can be used for both14:44
abentleyAnd you would not *need* to specify different credentials for the same host.  You could specify 'ssh' instead.14:45
vilaAnd it may even be mandatory to store them in things like OS X keychain or gnome keyring, i.e. sticking to known schemes14:46
vilabut if I use sftp and connect to bzr+ssh the credentials will not be found ?14:46
vilabut if I define sftp  credentials and connect to bzr+ssh the credentials will not be found ?14:46
abentleyvila: Right.14:47
vilaEerk, what's the point then ?14:48
vilaWhile writing the spec I *did* use sftp until I realized that it will be a trap for the user because all the remote host knows is users or keys for ssh, users for ftp, users for http, etc14:55
pysquaredHello.  I am migrating from CVS.  Is there a way to get Bazaar to either preserve mtime, or set the mtime of checked out files to the date of the last file change?14:55
abentleyvila: There are certainly cases where users have multiple accounts on one machine, one for shell access, one for Bazaar.14:59
abentleyvila: I haven't come up with a plausible reason for having two accounts, both used for Bazaar.14:59
vilaYou also need to come up with a way to handle that on the remote host15:00
vilabut it may be possible with different ports15:00
lifelessabentley: on the way to bed... but you might like to know that the losa's run two accounts on launchpad's code hosting service from one unix account, on a pqm machine15:00
abentleyvila: I don't see what the problem is.  It's easy to have multiple ssh accounts.  You just specify username.15:01
lifelessabentley: (both accounts are for separate unrelated private branches)15:01
lifelessanyhow, dunno if that matters; gnight everyone15:01
beunonight lifeless15:02
nbjaymevila: does that mean bzr+ssh is the most preferred way. i use bzr sftp. :(15:02
nbjayme?15:02
nbjaymegnight lifeless.15:02
vilanbjayme: that's totally unrelated but bzr+ssh should gives you better performances :)15:02
nbjaymeokay... thanks. :)15:03
vilanbjayme: we are discussing how to describe credentials in authentication.conf15:03
vilaabentley: the only problem I have is that declaring sftp credentials leads to bzr+ssh credentials being not found except if use ssh, go explain that to the average user :-)15:05
abentleyvila: Anyhow, as I said, I'm not interested it doing it now.15:06
vilaok15:06
vilaabentley: what is the scope of you modification then ? Writing an authentication.conf file when launchpad-loging is used ? Or more ?15:07
vilaLOSA: ping, pqm blocked15:09
abentleyvila: Also, writing an authentication.conf entry when it discovers that there is a configured login, but no corresponding authentication.conf entry.15:12
abentleyvila: But I think that's all.15:13
vilaok, great, I can work on other parts then15:13
pysquaredBazaar does not set mtime of checkout out files (which I would like), but when doing "bzr diff --using=...", the old/* files it creates have the mtime set (so it is possible).15:21
pysquaredShould I submit a patch?15:21
pysquaredAny bzr wizards around right now?15:22
abentleypysquared: Setting the mtime to the stored date messes up build systems.  We do not want that.15:23
pysquaredI did not realise until I started using bzr how much I used mtime as a visual clue.  i want that.15:24
pysquaredPerhaps a checkout --restore-mtime option?15:24
pysquaredI hate coming back to work on a tree, doing a checkout and all the mtimes are the same.  Anyone else find this?15:25
abentleypysquared: This has been discussed on the mailing list in the past.  You should probably read up on it before trying to land such a patch.15:26
pysquaredabentley: thanks, I did search a bit but found nothing, so I asked here, you guys are always helpful.  I will look again.15:27
abentleypysquared: http://search.gmane.org/search.php?group=gmane.comp.version-control.bazaar-ng.general&query=mtime15:29
abentleypysquared: The ones about "revert" would also apply to checkout.15:30
pysquaredabentley: fantastic15:30
qebabHi. I have a bzr repository that I'm trying to make a svn repo from, for a couple of friends to use. I'm having problems getting things working here. Could anyone tell me how I should do this? I'm probably just doing it wrong, but I'm getting a lot of weird errors (Everything from segfaults to AttributeErrors). I'm using bzr-1.3.1ubuntu0 and bzr-svn 0.4.9-1.16:41
jelmerqebab, please try a more recent version of bzr-svn16:46
qebabjelmer: okay. As to how to do this, I svnadmin create a repo, svn co it somewhere, and then I bzr push to it?16:46
qebabor is there further magic I need to work16:47
jelmerqebab, there's no need to svn co it16:48
jelmerjust "bzr svn-push <svn-repository-location>/trunk"16:48
qebabcool :)16:49
=== cprov is now known as cprov-lunch
nbjaymei recently read in the launchpad news about stacked format.  and, it's blazingly fast in uploading my large repo but under +junk.  now I have a repo associated with a project... i tried --overwrite but it did not update the remote repo's format.  must i really delete the project's branch and reupload / push?16:54
nbjaymei meant *delete the focus branch in launchpad* and push my local branch?16:55
jelmernbjayme, yes, I think so16:57
nbjaymeokay thanks!.... by the way, congrats to the devs for the great feature. :)16:58
qebabjelmer: when running make for bzr-svn, it gives me this: /bin/sh: rst2html: not found16:59
qebabjelmer: is that going to be a problem?16:59
Odd_Blokeqebab: That's presumably just for docs, but you could just install it?17:00
qebabOdd_Bloke: the apt package was apparently not recent enough :)17:01
abentleyjelmer, qebab I don't think there's a requirement for the target branch to be in format 1.6.17:08
jelmerabentley: Sorry, I think I'm missing some context17:09
abentleyjelmer: Sorry, I meant nbjayme17:10
abentleyjelmer: I don't think there's a requirement to update the format of focus branches in Launchpad.17:11
jelmerabentley, ah, indeed17:11
jelmerabentley, related to that, it would still be nice to have a 'upgrade' button or "bzr upgrade" on a HPSS connection work a bit better ;-)17:12
abentleyjelmer: Yes, it does, but upgrading is async, and would have to run on a non-web machine.  Therefore a job handling framework is required.  I have been working on one.17:13
abentleyjelmer: I thought bzr upgrade on hpss was decent now, though.17:14
jelmerabentley, it works, but still does the actual conversion locally, thus it's very slow17:15
sohmestraGiven a bazaar branch, and and a branch that is based on that branch, yet lacks any common history...is there any way to "graft" the 2nd branch back onto the first?17:20
sohmestra"lacks any common history" meaning: an export of the original branch was placed under revision control and development continued from there.17:21
beunosohmestra, both versioned with bazaar, only that the second one wasn't branched from the first one?17:22
abentleysohmestra: You could perhaps regenerate the second one with the "rebase" plugin.  jelmer would know more about that.17:23
sohmestrabeuno: correct17:23
beunosohmestra, what abentley said  :)17:24
sohmestraabentley: I was fiddling with that...but it complained about having no common ancestery, so I figured that I didn't understand what it was supposed to be doing17:24
sohmestraanyway, I'll fiddle some more17:25
jelmerrebase doesn't handle the case where there is no common history yet (bug 231674)17:27
ubottuLaunchpad bug 231674 in bzr-rebase "can't replay, need maptree support in rebase" [Wishlist,Triaged] https://launchpad.net/bugs/23167417:27
abentleyjelmer: what's maptree?  Remapping file-ids?17:28
jelmerabentley, yes17:28
abentleyjelmer: I think a PreviewTree would also work for that.17:29
jelmerabentley: MapTree does exist, it's just not hooked up in the bzr-rebase commands17:30
jelmerbzr-svn's upgrade command makes use of it though17:30
abentleyjelmer: Yeah, I see it.17:30
jelmerabentley: I guess it wouldn't be a bad thing to get rid of it in favor of PreviewTree though17:31
abentleyjelmer: All other things being equal, of course :-)17:31
abentleyjelmer: maptree looks like it reimplements the Tree API.  Can you use it as a merge source?17:34
jelmerabentley, yes, that's the idea17:35
abentleyWow, I'd have thought you needed a bigger implementation to support that.  Good stuff.17:37
jelmerhmm, it doesn't appear we're doing that yet so it may not be complete anymore17:39
=== cprov-lunch is now known as cprov
mtaylorhey all... if I made a stacked branch and want to replace it with a normal branch ... what's the best way?18:47
beunomtaylor, maybe push --overwrite?  I'm not sure if that will work18:49
beunoyou can, alternitavely, delete it and push again, of course18:49
mtaylorbeuno: but locally... if I branch from it, will I get another stacked branch, or one with everything?18:49
beunoif you branch from a stacked branch, I don't think it defaults to stacked, you would get the full branch, unless you specify otherwise18:50
LarstiQbeuno: hmm, that would surprise me19:20
beunoLarstiQ, me too, but, I've been suprised before  :)19:25
LarstiQ:)19:26
ktenneyHowdy, seeking help creating an alias from a script. Looks like bzrlib.builtins.cmd_alias.set_alias, but I've not had success using this19:29
ktenneyI don't understand the cmd_xxxx stuff in general, is there doc?19:29
LarstiQktenney: the cmd_ stuff is not really meant to be invoked from other python code19:30
ktenneyah, what is recommended for defining an alias?19:30
LarstiQktenney: cmd_ should use other functions, those would be more fit for bzrlib consumers19:30
* LarstiQ looks at alias19:30
LarstiQktenney: config.GlobalConfig().set_alias(alias_name, alias_command) it looks like19:31
LarstiQktenney: where config is bzrlib.config19:31
ktenneyLarstiQ: thx, I'll try that ...19:32
ktenneyLarstiQ: works, thanks, bye.20:02
LarstiQok :)20:02
mwhudson_jam: did you see that if your bzr branches are in a stackable format they should be stacked on lp:bzr now?20:03
mwhudson_jam: might save your dsl line some stress :)20:03
jammwhudson_: not entirely, I'd have to upgrade all my branches, which would cause LP to re-mirror everything20:04
jamso potentially in the future it will help20:04
jambut it wouldn't help for me to go do it right now20:04
jam:)20:04
mwhudson_well, if the branch had been merged into lp:bzr it would be a pretty light mirror...20:05
mwhudson_so i'm not sure i really see that20:05
abentleyjam: Thanks for all the reviewage20:09
jamabentley: I'm happy to try and get our queue unstuck from time to time :)20:09
jamyour's just happen to be at the bottom of my email and thus easiest to find20:09
pickscrapeAnyone know off the top of their head what bundle buggy matches against when deciding if someone is a voter or not?20:22
beunoemail address20:23
beunoor, you log in through the webui20:23
pickscrapeJust the email address, and not the name part?20:23
beunoyeap, just the email address20:23
beunoof course, abentley would know 100% for sure20:23
pickscrapebeuno: thanks. Just trying to debug why it's not working for me. That helps :)20:23
beunobut I'm 95% sure  :)20:24
abentleypickscrape: The email address and the name part.20:24
pickscrapeabentley: ah, so if you have two mail clients that have slightly different names set up (though using the same email address), you have to be registered independently for each name?20:25
abentleypickscrape: Well, each email-id needs to be associated with your account.20:25
pickscrapeAh, you mean in submitter.id?20:26
beunophew, good thing I stuck with 95%20:26
beunoabentley, just curious, why do you check the name as well?20:26
abentleybeuno: mostly because it was the fastest thing at the time.20:27
beunoabentley, heh, ok, makes sense   :)20:28
abentleylifeless: ping21:09
=== thumper_laptop is now known as thumper
lifelessabentley: hi22:19
abentleylifeless: nm.  PQM was stuck.  Isn't now.22:20
=== thumper_laptop is now known as thumper
lifelessabentley: did a losa intervene, or did it just come good?22:20
abentleylifeless: herb intervened.22:20
lifelessk; do we know the cause?22:20
=== TheMuso_ is now known as TheMuso
pickscrapeWhat is the meaning/purpose of the "My Pending" and "Mine" tabs in BB?23:00
jelmerpickscrape, one is stuff you haven't reviewed (including stuff from others)23:05
jelmerpickscrape, the other are your own submissions23:05
jampickscrape:  things you have submitted which may be marked 'resubmit'23:05
jamversus things which you might have reviewed23:05
jamand may be responsible for merging23:05
pickscrapeRight. I've submitted one thing myself (the only thing so far) and it not appearing under either.23:06
pickscrapeIt does appear under "My Todo" and "Pending" though.23:06
a_c_mi'm trying to get bzr working on my local host , using ssh+bzr but cant seem to get it to work23:26
a_c_m(testing it ready for a deployment on a server)23:27
bob2is bzr in your PATH?23:27
a_c_mits in /usr/bin which is in my path yes23:30
a_c_mi get 2 errors when i try it23:31
a_c_mTERM environment variable not set.23:31
a_c_mbzr: ERROR: Generic bzr smart protocol error: bad response ('',)23:31
a_c_mi did quite a bit of google searching, i was quite supprised how little documentation there is on setting up a bzr server (plenty on using bzr though)23:33
fullermdThat sounds like your shell rc files spitting output, confusing bzr.23:33
a_c_mahhhh23:33
a_c_mthat would be true!23:33
a_c_mlet me try 2 ticks23:34
a_c_mwell that gets me closer for sure!23:37
a_c_mOh my... it worked23:38
a_c_mthank you VERY much fullermd !23:38
a_c_mi never would have worked that out23:38
fullermdOh.  Well, it's surely a sign of my genius, and TOTALLY not the fruits of having screwed myself so indenumerable times in the past.23:41
* fullermd nods at himself.23:41
a_c_mlol23:44
a_c_mneeds to go on a wiki page or somthing somewhere23:44
a_c_mas when i searched for those errors i got bugger all23:44
fullermdWell, there wouldn't really be any constant error.23:45
a_c_mno?23:46
lifelessa_c_m: probably sftp wasn't working for you either23:46
lifelessa_c_m: and there are hits for that :)23:46
fullermd"TERM environment variable not set." is the tipoff in this case, but that's nothing to do with bzr; that's output right from your shell.23:46
lifelessthat said23:46
lifelessthere is a test23:46
fullermdIt would depend on exactly what output was being generated   :)23:46
a_c_mahh wasnt even trying sftp23:46
lifelessfullermd: we can write up a 'check your server config' checklist23:47
lifelessfullermd: with 'ssh -T host echo' as a test line23:48
a_c_mfullermd: mine was a combo of lifehackers handy bashrc + some simple customizations ;)23:48
fullermdOh, I was thinking jump right to "ssh -T host bzr version" to check as much of the path as possible.23:50
lifelessfullermd: right - but when it fails, we can test that one step in isolation23:51
lifelessfullermd: which is clearer than we do today23:51
lifelessin other news23:53
lifelessEvery 2.0s: du -s work_root_for-bzr.inv work_root_for-bzr.inv-branchAndFix                                                                                                                  Thu Oct 16 23:53:58 200823:54
lifeless648036  work_root_for-bzr.inv23:54
lifeless12446008        work_root_for-bzr.inv-branchAndFix23:54
lifelessthats right, split inventory is at 12G and climbing23:54
lifeless"epic"23:54
fullermdIt's a feature.  bzr comes with built-in I/O benchmarks.  Email reading is expected for 2.0.23:55
elmoeven gnu hello has email reading23:56
lifelesspoolie: was debugging an lp issue @ 9. anything particularly interesting from the standup23:59
lifeless?23:59

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