[00:00] and Fix Released when I tell it I release a milestone [00:00] or something [00:00] I'll leave the details to you guys :-) [00:00] I don't quite understand [00:00] fix committed automatically when what? [00:00] beuno: When a branch is merged to the development focus. [00:01] ah [00:01] what has that to do with bugs? [00:01] s/branch/branch that fixes a given bug/ [00:01] I'm talking about the bugs statuses [00:01] * beuno blinks [00:01] Then the bug gets automagically marked as Fix Committed. [00:02] that's a bit tricky [00:02] you have "Fix Available" on the branch when I push a --fixes. If that gets merged to the development focus then it sets the bug "Fix Committed". [00:02] beuno, *grin* and you thought I was bad. ;) [00:02] james_w, gotcha [00:02] should be viable [00:02] emmajane's paying us to make her look better. :p [00:02] file a bug, I'll try and make it happen [00:02] james_w, how come I have to report bugs and you just get IRC requests. ;) [00:02] WOO! [00:02] :) [00:02] emmajane, ;) [00:04] beuno, hopefully the screenshots were helpful as well? [00:04] emmajane, they're better than a patch [00:04] deeply appreciated [00:04] kay [00:05] I'll continue to include them as I find more things. [00:05] if all users where like you, software would beperfect [00:05] hehe [00:05] beuno, You can come and work with Drupal when you're done with LP. ;) [00:05] (my typing, on the other hand...) [00:05] done with LP? ha! like that will ever happen [00:06] * emmajane grins [00:06] LP is *big* [00:06] huge [00:06] so is Drupal ;) [00:06] it will be ready for you when you're done ;) [00:06] When I try to push my bzr branch to launchpad it give me this error: Transport operation not possible: http does not support mkdir() [00:07] heh, I'm sure it will [00:07] What can I do to fix this? [00:07] Flare183, you need to specify your launchpad login [00:07] Flare183: 'bzr launchpad-login -h' [00:07] bzr launchpad-login [00:07] oh ok [00:07] -h? [00:07] Help. :D [00:08] right, fish/teach to fish [00:08] I hate fishing, so I just give people food [00:10] NOM NOM NOM [00:13] ok Now I get this error: Target directory already exists. Please select another target. [00:13] I know it exists thats why I'm pushing it there. Duh bzr! [00:13] How can I fix this on? [00:13] one* [00:13] Flare183: What command are you using? [00:13] bzr push [00:14] Or, rather, what's the full command-line? [00:14] Actually I'm using Olive [00:14] But I can use the command line [00:14] hold on [00:14] Heh, serendipitous. [00:14] What's the location you're trying to push to? [00:14] Flare183, add --use-existing [00:14] oh ok [00:15] the error should be telling you to add the flag ;) [00:15] jesse@jesse-desktop:~/Python Projects/bot$ lp:~richardson183/ubuntu-bots/flarebot --use-existing [00:15] bash: lp:~richardson183/ubuntu-bots/flarebot: No such file or directory [00:15] jesse@jesse-desktop:~/Python Projects/bot$ [00:15] ... [00:15] 'bzr push ...'? :) [00:15] hold on [00:15] sorry i screwedup [00:15] screwed up* [00:25] lifeless: FWIW, Launchpad hasn't been able to mirror https://code.launchpad.net/~lifeless/bzr/repository for a month. [00:25] fail [00:25] :P === mw is now known as mw|out [00:49] folks, is there any permissions implemented in bzr itself? [00:49] because we are having a problem... one of my devs has read access to the main branch, but cannot co the trunk [00:49] http://dpaste.com/88990/ [00:50] loxs: Have you checked FS permissions? [00:50] won't read-access via ssh (try to) take a lock? [00:50] no [00:50] Odd_Bloke, they have read access [00:51] bob2, what do you mean by "take a lock"? [00:51] Well, checkout implies commit access. Does 'branch' work? [00:51] loxs: don't mind me [00:51] hmm, I didn't know that, we'll try with branch [00:52] loxs: Also, do they have execute permissions on .bzr? [00:52] Because if not then they won't be able to access anything under it. [00:53] "chmod -R a+rX .bzr" or some equivalent is probably what you want. [00:53] yes, they have +x [00:53] beuno: thanks [00:54] james_w: Whereabouts are you based these days? [00:54] Odd_Bloke: Bristol [00:54] loxs: And can they actually read that file via other means? [00:55] james_w: Cool, I remembered that your old job was there, but didn't know if you were still there. [00:55] Odd_Bloke: yeah, no reason to leave yet [00:55] Odd_Bloke: how's work treating you? [00:55] james_w: Eh, so-so. [00:55] oh no, that will be over now won't it? [00:56] oh, it's a year isn't it? [00:56] 9 months. [00:57] I'm finding getting up in the mornings quite difficult. [00:57] And there's rather more OpenOffice in my life than I'm entirely comfortable with. [00:57] I don't really know whether I have issues with this job, or with 9-5 jobs in general, though, this being my first of more than 2 weeks. [00:57] OpenOffice should come with a health warning [00:58] yeah, I found 9-5 tough [00:58] yes, Odd_Bloke they can read the file when they do it via cat etc... and it raises the same exception when using branch [00:58] We're doing so much crazy stuff with OO.o. [00:58] though I ended up working like 7-3 quite often so that I actually had an evening [00:59] Ranging from writing an automated presentation player to backporting OO.o 3 to Sarge. >.< [00:59] ouch [00:59] my sympathies [00:59] Thankfully I've mostly avoided the backporting. [01:00] It's also a little frustrating that I don't feel I'm working _on_ free software so much as I'm working _with_ it. [01:00] Which is nice, but this presentation player we're writing is going to be non-free. [01:01] Making it, IMO, a complete waste of my time. [01:03] Certainly it's a far cry from stage diving. :p [01:04] :-) [01:07] spiv: ping me when you're online please [01:07] james_w: Anyway, the reason I asked where you were is that I have a friend at Bristol, and it'd be good to meet up for a drink if I ever get around to visiting him. [01:08] Odd_Bloke: sure, I'd like that [01:10] Cool. [01:15] loxs: hi [01:16] loxs: /home/bazaar/bloxs/trunk/.bzr/branch-format is the path reported in your error [01:16] loxs: can you have one of the users try 'scp HOST:/home/bazaar/bloxs/trunk/.bzr/branch-format .' [01:28] lifeless, thanks but we resolved it... typical administrator error... :) [01:28] they had permissions to read the repositories... but they didn't have permissions to read the top /home/bazaar/ directory :) [01:28] heh [01:43] lifeless: pong [01:43] lifeless: was online, just not looking at IRC very much! [01:44] spiv: I wanted to know if my comments made sense etc [01:44] spiv: the void was a tad disturbing [01:45] lifeless: don't stare into the abyss ;) [01:46] * spiv quickly rereads [01:49] lifeless: so, I see a loop you added to fetch, although I don't grasp how it's deltaing a chain of inventories [01:50] lifeless: the high-level description you gave makes sense, I just don't see the code. [01:53] spiv: ah yes [01:53] spiv: I lied apparently [01:53] Heh. [01:54] spiv: the loop would be something like: [01:54] grab the the inventory meta node for all the inventories [01:54] plus one for any arbitrary inventory outside the set that the target has [01:54] lifeless: _install_revision looks like it has added code related to this, maybe? [01:55] then do a set based difference on the node's pointers [01:55] and repeat [01:59] spiv: not really [02:00] spiv: _install_revision has a inventory cache to get deltas, because it can insert deltas more cheaply than full inventories [02:05] lifeless: thanks [02:05] * spiv -> lunch === ja1 is now known as jam === ja1 is now known as jam [02:34] spiv: the packer has no cache set [02:34] spiv: you should chat more :> [04:24] spiv: ugh, I hate lp's handling of attachments [04:24] send me the damn diff, biatch [04:36] lifeless: http://rafb.net/p/9LQyFJ98.html [04:36] lifeless: or do you mean email? [04:36] spiv: lol I was ranting at lp [04:36] at what it does [04:36] not at you [04:36] Oh, right :) [04:36] Yeah. [04:36] I clicked to see the attachment [04:37] and I commented too [04:44] lifeless, careful or beuno will tell you to post a bug about LP. ;) [04:47] emmajane: oh theres plenty of those already [04:47] emmajane: :) [04:47] heheh [04:48] he likes it when you *attach* pictures. ;) [06:35] morning [06:36] am i right that 'shelve' is moving into core? [06:37] already moved, as far as I know [06:39] Yep. [06:39] yeah, i saw r3823...very nice [06:43] fix for #293054 will go into 1.9 ? [06:43] gour: its a new shelf, not the old one moved [06:43] bug 293054 [06:43] Launchpad bug 293054 in bzr "bzr fails with python2.6 and https missing sendall" [High,Fix committed] https://launchpad.net/bugs/293054 [06:44] gour: I don't know, it might, 1.10 for sure [06:44] lifeless: but the new shelf provides the same functionality? [06:44] different [06:44] much in common [06:44] it can shelve more things [06:44] but some aspects are not as mature [06:45] aha...still it's nice that plugin's functionality goes into core... [06:46] * fullermd really looks forward to being able to shelve more things. [06:46] A notable percentage of the times I've wanted to shelve, there have been renames or binary files involved. [07:27] hi all [07:28] gour: I doubt bug #293054 will make it into 1.9 but I'll try [07:28] Launchpad bug 293054 in bzr "bzr fails with python2.6 and https missing sendall" [High,Fix committed] https://launchpad.net/bugs/293054 [07:32] vila: thanks [07:33] gour: you're welcome, your testing of python-2.6 support is very much appreciated :) [07:35] vila: heh, python-2.6 is default in archlinux, so i didn't do any extra work :-) [07:35] ...except using bzr [07:38] gour: which is exactly the point of having testers :) I had to rebuild a python-2.6 from sources to reproduce the problem, and a pycurl too (for different but related reasons) since my setup wasn't as clean as I thought, so indeed, it was harder for me to notice the problem [07:40] i'm glad if i was somewhat useful in improving my beloved tool [07:51] Man, I hate the half-assed VCS capability of wikis sometimes... [07:59] Is there a plugin or some such that allows emails to be sent out from the server when commits are made? [08:01] the bzr-email plugin; I *think* its been updated to work with commits as long as you're using bzr+ssh [08:01] spiv: ^ do you recall? [08:01] eydaimon: you can definitely just install it on each machine [08:02] eydaimon: there is also a cron based plugin that can mail when a branch changes [08:02] ok, thanks [08:45] * fullermd figures he's spammed enough people for one night. [08:47] lifeless: don't know, sorry [08:59] * gour just re-read http://andrew.puzzling.org/diary/2008/July/29/rebase-criticism post and wonder whether there is scope for rebase in bzr [09:01] what's happening with loom plugin? it looks like not much since 1.3... [09:03] gour: there's a rebase plugin for bzr. [09:04] gour: I just happen to think it's usually not the best option :) [09:07] spiv: yeah, i did not go into looms yet, but example of selective merge is simple & good enough that i wodner why i'd need rebase [09:08] I just merged a bunch of revisions from another branch using bzr 1.9rc1 and bzr-svn 0.4.14, but apparently the merge wasn't recorded [09:08] first off, bzr st showed only straight modifications and no merge, then the "missing" command still shows the merged revisions as missing [09:08] gour: the attraction of rebase is that it's a fairly simple mental model to work with [09:09] spiv: heh, it seems my mind is at different wavelength then :-D [09:09] gour: so if you are the sort of person that thinks in terms of "this branch would be better if revision #N was done differently" then rebase seems natural [09:11] what is the price for it? [09:12] Well, you lose the original history. [09:12] and new merge will produce (more) conflicts? [09:13] when you've merged, it's supposed to be indicated by "status" no? [09:13] Which impacts operations that use history, most obviously merge -- if someone else has branched off your original branch, then you rebase, now you have two branches that independently make similar changes. Which means you've almost certainly created conflicts that you didn't have before. [09:13] dissonans: right [09:13] well, it isn't :/ [09:13] I just confirmed [09:13] dissonans: but we don't record merge history for cherrypicks yet [09:13] spiv: yes, similar with doing unrecord in darcs after the patch went into wilderness? [09:13] dissonans: how did you do the merge? "bzr merge -r A..B"? [09:13] spiv: ah hm [09:14] yep, specific revisions [09:14] that's a problem [09:14] gour: I'm not familiar enough with darcs, but that sounds likely. [09:14] I know merge has worked as I expected, but maybe I wasn't cherrypicking [09:15] dissonans: probably. Or maybe the base of your cherrypick was already in the branch you were merging into. [09:15] spiv: nah [09:15] spiv: is it possible to record merge history when cherrypicking in bzr? [09:15] (by bzr's design) [09:16] gour: there was talk about how to support them at the March 2008 sprint [09:16] I forget the details, but they're probably on the list somewhere. [09:17] cool. cherrypicking-ala-darcs would be great [09:17] It would. It's a pretty common request, unsurprisingly. [09:18] should I follow any other pattern to integrate changes from the trunk in my release branch then? [09:18] hi everyone. has anyone got any tips about converting from an RCS like system (PVCS) to bzr? [09:18] can't see how to avoid it, and I kind of relied on having the merge history [09:19] btw, what is with the bug #109143 ? [09:19] Launchpad bug 109143 in bzr "hpss does not support ~ (tilde) for home dir access on bzr:// or bzr+ssh://" [High,Triaged] https://launchpad.net/bugs/109143 [09:19] gour: not enough people have complained about it recently ;) [09:20] ok, let me add myself to the list [09:20] I knew I shoulda set up that cron job... [09:20] gour: actually, you're the second person to mention it to me in the last week or so. It's probably due to be bumped up to the top of my list of things to do... [09:21] we want to convert to bzr and i'm thinking of moving just the head over then manually recreating any branches we had (PVCS has no concept of a whole project branch, just a file by file one) does that sound stupid? [09:23] i mean can i somehow change timestamps of commits? [09:23] crisb: I would suspect converting PVCS to CVS or SVN, and then going from there to bzr, would be the simplest thing to try... [09:23] (since there are existing tools for both those paths out of PVCS, and both of those paths into bzr) [09:24] fullermd: yes sorry thats my plan, its just they dont give me anything very sane at the end of it if I leave it all up to the conversion tool [09:26] Mmm. Yeah, if you started doing the sort of weird per-file stuff PVCS/RCS/CVS let you do, I can see that... [09:28] fullermd: so as we really dont want to end up with people having to know 2 (very different) tools we want to make a complete break from the past :) but do i have the ability to go in and fiddle about with the bzr repository when i'm making these manual branches from the historical stuff? [09:32] You can't change existing commits, no. But you can certainly [through bzrlib; not through the CLI] set whatever attributes (including timestamps) you want on freshly created revisions. [09:33] where can one find more info in regard to "Predefined formats for dumping version information in specific languages are currently in development." ? [09:34] gour: "bzr help version-info"? [09:36] fullermd: i mean if there is some work for other concrete language-formats like it's for 'python' === kiko-zzz is now known as kiko-afk [09:39] * gour thinks (un)shelve is great stuff [09:40] so one can go from zzz to afk and hist IRC client noticed... [09:40] so one can go from zzz to afk and his IRC client noticed... [09:42] hmm, cdiff prints in grey on white bg...how to fix it? [10:46] uhoh,, i just ran bzr merge in my local svn working copy of a project i'm working on... i'm tired and think i just didn't think,, will this do anything bad? [10:47] it says it's generating file id map at the moment. [10:52] NET||abuse: just hit ctrl-C if you didn't want to do that [10:53] .. well, doing a svn up on the working copy doesn't give out [10:53] svn status shows up no new weird entries [10:53] seems ok [10:54] back in my bzr copy now [10:55] As I see it, the problem is that that project isn't in bzr ;) [10:55] did bzr merge to get changes from other people down, bzr log only shows rev 487, we're on 520 [10:56] james_w, hey hey, happy birthday! [11:02] NET||abuse: thats normal [11:02] NET||abuse: revnos are per-branch [11:03] NET||abuse: (by analogy, consider multiple svn repos being synced with svk; revno's are per repository there) [11:03] gnight [11:08] lifeless: cheers. :) [11:08] lifeless: seeya === Leonidas_ is now known as Leonidas [11:36] thanks beuno [11:56] I have a live website that is a standalone tree. I want to allow someone remote read+write access to the repository (htdocs/.bzr/), but I don't want to give them any access to the working tree files (htdocs/) or in fact any path on my server's filesystem. What would be the quickest way to accomplish this? [11:57] Oh and SSH / SFTP are out of the question [11:59] Holy monkey, why does this "bzr log -v" require 500MB of ram..... [11:59] It's a rather large tree, but even so [12:03] I also forgot to mention I need some sort of authentication, even if it's rudimentary. I think that rules out "bzr serve" [12:03] I'm not aware of any other form of write access [12:04] since you've ruled out ssh, sftp and the smart server [12:04] well, except bridging the filesystem to them somehow. [12:04] Hm, but I've read that the smart server can be used with http [12:04] you can't write over http. [12:04] You can, with the webdav plugin. [12:05] vila will know more. [12:05] How can I tell a signed commit from an unsigned ditto? [12:05] argh [12:05] I didn't see that mentioned in the docs, thanks [12:06] bzr+ssh, bzr+http[s], webdav all provide various kind of authntication [12:07] right I was just looking at authentication.conf [12:07] wrong path [12:07] authentication.conf is how you describe *your* credentials when accessing remote servers not how you want your local server to handle authentication [12:08] Right, I think I understand that. It's SSH/webserver/webdev/etc that provide the server-side auth [12:08] and if you install a smart server in your http server you *have* write access and you can use http[s] to handle authentication [12:09] Rolly: yes [12:09] Ah, you mean like with bzr-smart.fcgi or fcgi.py I can get write support? [12:09] yes [12:09] fabulous [12:09] It's a little confusing at first [12:10] If you feel you can make that clearer in the doc at any place, patches are welcome :) [12:11] just to be clear, using the smart server in the http server will just allow my remote user to just access the repository, yes? No filesystem access? [12:11] (ignore that redundant "just") [12:12] Rolly: that's the idea yes [12:13] Cool [12:14] the user reference definetely needs some clearing up, maybe I'll take a stab if I wrap my head around this [12:14] Err, wait, re-reading your description: access to htdocs/.bzr but no access to htdocs itself is a bit contradictory since the later is the working tree for the former [12:15] if you really want to separate the two just give your user write access to a different branch at a different place and merge/update locally what you want [12:15] I didn't mean literal filesystem access to htdocs/.bzr/, I actually meant "access to the repository" [12:16] like with svnserve, you can serve a repository through svn:// and the users don't have filesystem access [12:16] In that sense then yes if .bzr is a repository and not a branch my warning doesn't even apply [12:17] Well, when I "cd htdocs && bzr info", I get "Standalone tree, branch root: ." [12:20] In SVN terminology, htdocs/ is my repository _and_ my checkout. I need to give remote access to the repository but not the checkout [12:20] You realize that if you give write access to your repo, even if the smart server doesn't update your working tree when your remote user commit, you will take his commits into account the next time you do bzr update ? [12:20] yeah, that's what I want [12:20] I just need a firewall (me) to check missing revisions before I update [12:21] Then you'd better give him access to another branch from where you can pull or merge (IMHO) [12:22] That will give you more control of your htdocs content [12:22] While taking his modifications will still be easy (even easier the day you disagree with some modification) [12:24] I see your point [12:26] That's a usual setup where your user pull from your repository, push to a staging one and *you* pull or merge from the staging one acting as the gatekeeper (or firewall as you said) [12:27] Hm, in what cases is that more convenient for the gatekeeper? [12:29] Rolly: In the case where you don't want some changes. [12:30] Because then you just don't pull, rather than having to perform acrobatics with the history of the branch. [12:30] But in a production<->staging scenario, a bad commit can just be deleted (there isn't going to be a lot of activity on this repository, and no parallel coding going on [12:30] A bad commit can be deleted, but should you be deciding the best way to do that, or should the developer? [12:31] in this case, me [12:31] In that case, there's not a massive amount to be gained from pushing to a separate branch, except that it is: a) good practice, and b) more future-proof. [12:31] gotcha [12:33] by the way, in the user reference, there is one mention of using an "http:// URL when a smart server is available via HTTP" [12:33] everywhere else, it talks about "bzr+http://". What is the difference? [12:34] Rolly: Where is that reference? [12:34] http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#hooks [12:35] and then if you look here, it also mentions both protocols: http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#serving-bazaar-with-fastcgi [12:35] "Now you can use bzr+http:// URLs..." [12:35] "Plain HTTP access should continue to work..." [12:36] Hmm, I'm afraid I don't know. [12:36] I've never set up smart HTTP access. [12:36] I'll just dive in and see what happens [12:39] Rolly: the smart client probes any http server and revert to plain http when no smart server answers [12:40] aha [12:41] vila: You can disable that behaviour using http+nosmart://..., right? [12:41] right [12:41] And does the HTTP smart server give me any benefit on read-only branches? [12:42] a benefit would be speed, right? [12:42] Odd_Bloke: more and more :) [12:43] Right, I wasn't sure if 'smart' meant 'I can write to this', or meant 'generally better in every way'. [12:43] and if you find a place where it is slower than raw http, file a bug [12:43] the later [12:44] Cool. [12:44] I'll look into setting it up at some point. [12:49] lifeless: *nudge* https://code.edge.launchpad.net/testresources/+activereviews === kiko-afk is now known as kiko [13:35] hello, is there a way to version control ODT documents with bzr? [13:36] loxs: odt is compressed xml or not? [13:36] gour, I have no idea [13:37] loxs, I don't thing there is a good way to do so ATM, no [13:38] it will version it as binaries [13:38] loxs: it looks it's zipped xml content, so not the best candidate [13:38] which isn't very good [13:38] a good way to do what exactly? [13:38] OO has versioning built in [13:38] and you can plug VCSs into it [13:38] but I don't know too much abput it [13:39] hmm, OO has versioning? interesting [13:39] loxs: i decided to use reST markup for all my writings...it can be nicely versioned with bzr, and there is nice rst2odt converter [13:39] but I suppose there is no good way for collaboration built in OO [13:40] loxs: ...if reST markup satisfy your writing needs. [13:40] loxs: what do you expect when you say 'to version control ODT documents'? [13:40] gour, the thing is that most of my contributors won't manage to do it [13:40] luks, version control and collaboration :) [13:40] what does that mean? [13:40] loxs: hmm, reST is so simple and one can write it in Notepad [13:40] bzr can do it just fine, if you use my definition [13:41] loxs: and using some bzr-gui it's easy for your contributors to commit and/or send you 'bundles' for merging [13:41] * gour --> lunch.bbs [13:43] I'm afraid that I need rich formatting in a WSIWYG editor... so rest is not the best option, gour [13:44] it's not technical documentation, but medical one... [13:44] Well, versioning ODTs in bzr won't be pretty. [13:44] and we need to collaborate on things like presentations etc [13:44] Or, for that matter, much better than saving copies of the ODT, AFAIK. [13:44] versioning binary files won't be pretty in any vcs [13:45] but as this question is in #bzr, I don't think that's the problem [13:45] But if you could get it in an intermediate format, then things might be better. [13:45] yeah, after all I can give up and use google docs :( [13:46] the thing is that I want the docs "in-house" :) [13:46] it's not like google docs can merge documents better than bzr [13:47] hi, when I try to push my branch to a shared repository via ftp protocol I get: [13:47] zr: ERROR: Transport error: FTP temporary error during APPEND /bzr-repo/.bzr/repository/upload/bh3t4m7b8vud2womzv46.fetch.Aborting. 451 /bzr-repo/.bzr/repository/upload/bh3t4m7b8vud2womzv46.fetch: Append/Restart not permitted, try again [13:47] Does anyone know what this means? [13:47] jonnydee: your FTP server doesn't support APPEND [13:47] jonnydee: which probably means you can't use it with bzr [13:48] weird... after a "bzr pull" of the latest bzrtools, all bzrtools command are gone (absent from "bzr help commands")... [13:48] well, that's not good news :( [13:48] guilhembi: What do you see in ~/.bzr.log? [13:48] Odd_Bloke: I see [13:48] 'dict' object has no attribute 'register_lazy' [13:48] Unable to load plugin 'bzrtools' from '/home/guilhem/.bazaar/plugins' [13:49] you are using old bzr, upgrade to 1.9 [13:49] on the screen, that's interesting... now updating to latest bzr.dev [13:49] or downgrade bzrtools [13:49] luks: thanks, it's the solution [13:51] I just asked our IT to create an ftp account for hosting bazaar branches and now the APPEND functionality should be the problem? ok, I see I will not be able to use Bazaar in our company... :( [13:52] jonnydee: :( [13:52]