| Spaz | hmm | 00:33 |
|---|---|---|
| Spaz | i'm using bzr_access to grant multipule users access to the same repository, any way i can make it play nice with bzr? | 00:33 |
| Spaz | er | 00:36 |
| Spaz | s/bzr\?/CIA/g | 00:37 |
| Spaz | wow i'm a failhouse tonight | 00:37 |
| Spaz | actually | 00:50 |
| Spaz | let me rephrase that | 00:50 |
| Spaz | any way to get bzr-cia working when using bzr_access? | 00:51 |
| === ampelbein is now known as Ampelbein | ||
| lifeless | Spaz: I don't see why they would be related or interact at all | 01:02 |
| Spaz | lifeless, basically, i want to report commits to the main repo | 01:02 |
| lifeless | sure, I'm just saying I don't see the correlation with bzr-cia | 01:03 |
| lifeless | and bzr_access | 01:03 |
| lifeless | did you have it working with bzr-cia and not bzr_access? | 01:11 |
| === d6g|away is now known as d6g | ||
| === d6g is now known as d6g|away | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| emmajane | abentley: pokpokpoke you know william witteman?! | 02:12 |
| * emmajane also has a random bzr question about this thing called "redhat"? | 02:14 | |
| lifeless | just ask :P | 02:15 |
| emmajane | for the gitvsbzr thingy someone was complaining that tests are breaking in redhat? Other than, "stop using redhat" is there an answer for that or someone who is somewhat responsible for that? | 02:15 |
| * emmajane had to phrase it, lifeless :) | 02:15 | |
| emmajane | or figure out how to phrase it rather. :) | 02:15 |
| lifeless | I don't think any of the high-volume contributors to bzr itself develop on redhat | 02:16 |
| emmajane | hrm. | 02:16 |
| emmajane | so the answer is sort of switch to ubuntu? ;) | 02:16 |
| * davidstrauss still has 11 failures from selftest on CentOS 5 with bzr + BzrTools | 02:17 | |
| emmajane | davidstrauss: dude. ouch. | 02:17 |
| lifeless | emmajane: no, its more - file bugs | 02:19 |
| * emmajane nods. kay. thanks, lifeless | 02:19 | |
| lifeless | on any platform we would expect | 02:19 |
| lifeless | 'make check' to pass | 02:19 |
| lifeless | win32 has some known issues | 02:20 |
| lifeless | so make that any foss platform :P | 02:20 |
| emmajane | heheh | 02:20 |
| lifeless | bzrtools is part of the ecosystem, but we don't require zero-failures from it at any point in time like we do for bzr itself | 02:20 |
| davidstrauss | The one that concerns me most is this: FAIL: per_lock.test_lock.TestLock.test_readonly_file(fcntl) IOError not raised | 02:21 |
| lifeless | davidstrauss: don't run the tests as root | 02:21 |
| * emmajane blinks. | 02:21 | |
| lifeless | all mainline commits to bzr since it moved to pqm are done by pqm only after the test suite passes | 02:21 |
| davidstrauss | lifeless: very nice :-) | 02:22 |
| davidstrauss | lifeless: Indeed, the "root" issue makes sense. | 02:22 |
| davidstrauss | lifeless: This is on my package building VM | 02:22 |
| emmajane | what is pqm? sorry. :/ | 02:22 |
| lifeless | emmajane: its a robot that takes a branch and merges it to the mainline for us | 02:22 |
| lifeless | it enforces the tests-pass policy for us | 02:22 |
| emmajane | lifeless: ah, cool. | 02:23 |
| * emmajane nods | 02:23 | |
| emmajane | makes sense. | 02:23 |
| lifeless | without requiring every developer to remember, or be trusted to always remember | 02:23 |
| lifeless | or have the reference platform (python 2.4, all dependencies, etc) | 02:23 |
| * emmajane nods. | 02:24 | |
| lifeless | davidstrauss: so if you can run the test suite (make check) as non-root, I'd love to know about failures | 02:25 |
| emmajane | lifeless: for the bzrvsgit is it then, 'we love you all, but please submit bugs'? | 02:25 |
| lifeless | emmajane: yes | 02:25 |
| davidstrauss | lifeless: Trying now | 02:25 |
| emmajane | lifeless: cool :) | 02:26 |
| emmajane | lifeless: I was a little bit like, 'redhat? RLY?' | 02:26 |
| lifeless | I'm reasonably sure the redhat packagers run the test suite w/o errors | 02:26 |
| lifeless | and we'd certainly pay attention to any issue | 02:27 |
| lifeless | I will note though, that I can only really check fedora to reproduce things, RHEL being proprietarish and all | 02:27 |
| * emmajane nods. kay. I'll check back if I have more useful information, but this is cool | 02:27 | |
| lifeless | reason #34 to be fully open source; people can debug on your platform | 02:27 |
| lifeless | I'm heading off for a bit, ciao | 02:28 |
| emmajane | lifeless: thanks muchly, as always. :) | 02:28 |
| davidstrauss | lifeless: I'm using CentOS | 02:29 |
| === abentley1 is now known as abentley | ||
| * emmajane tries poking abentley again. | 02:30 | |
| thumper | are there any pages on the bzr wiki about google summer of code? | 02:31 |
| * thumper waves at emmajane | 02:31 | |
| emmajane | thumper: are you doing gsoc? | 02:31 |
| * emmajane waves to thumper | 02:31 | |
| thumper | heh | 02:31 |
| thumper | I think that is a little unlikely | 02:31 |
| thumper | I'm not a student any more | 02:32 |
| emmajane | nonnono Imean "you" not "you" | 02:32 |
| thumper | however I know someone who knows students, and I'm trying to pass on details | 02:32 |
| thumper | emmajane: yes bzr is trying to organise gsoc | 02:32 |
| emmajane | thumper: the org alread has to be approved... | 02:32 |
| thumper | emmajane: I believe igc is handling it | 02:32 |
| Spaz | lifeless, ah, i got it all working with a ghetto script | 02:32 |
| emmajane | thumper: are you doing it under ubuntu? I think i read that they got in? | 02:33 |
| Spaz | it basically cd's to where the repo is and does bzr cia-submit for all new revisions | 02:33 |
| thumper | emmajane: I don't know that much about it other than poking people to make sure bzr gets involved | 02:33 |
| emmajane | thumper: I think you might have missed it if you're still poking peoople. :) | 02:33 |
| thumper | :( | 02:33 |
| thumper | emmajane: is there a definitive list of approved projects? | 02:34 |
| emmajane | thumper: clearly poking is not so productive. less of the poking, more of the doing. | 02:34 |
| thumper | emmajane: I know that someone is doing | 02:34 |
| emmajane | yay | 02:34 |
| thumper | emmajane: and I think that someone is igc | 02:34 |
| * emmajane checks the site. | 02:34 | |
| emmajane | http://socghop.appspot.com/program/accepted_orgs/google/gsoc2009 | 02:35 |
| emmajane | thumper: idon't see bzr there :( | 02:35 |
| emmajane | I lied, Ubuntu isn't there either. | 02:36 |
| emmajane | maybe that was an application, but not acceptance. | 02:36 |
| thumper | oh FFS | 02:36 |
| emmajane | :( | 02:36 |
| thumper | emmajane: I'm at a loss for words | 02:39 |
| emmajane | thumper: that's sad. :( | 02:39 |
| wgrant | Ubuntu was unaccepted, I think | 02:41 |
| wgrant | It was there for a while. | 02:41 |
| * emmajane nods to wgrant | 02:41 | |
| * emmajane tries to figure out how to use irssi. | 02:42 | |
| emmajane | which is completely unrelated to anything. | 02:42 |
| * thumper uses konversation | 02:43 | |
| thumper | I tried irssi for about two days | 02:43 |
| emmajane | heh | 02:43 |
| * wgrant was tempted to move to Quassel, but has been using irssi for almost three years now. | 02:43 | |
| wgrant | Originally I used XChat. | 02:43 |
| emmajane | I'm on an EEE and don't have any in-depth trust that it will still be xandros tomorrow so is on her server using irssi. | 02:43 |
| emmajane | and apparently I'm tired and can't figure out which person to speak in. | 02:44 |
| emmajane | or something. | 02:44 |
| emmajane | wgrant: what does [Act: 1,2,4] mean? | 02:54 |
| thumper | gah | 02:56 |
| thumper | network manager is running amok | 02:56 |
| emmajane | thumper: did you figure out your adsl stuff? | 02:56 |
| emmajane | thumper: I always have problems with my network dropping my irc connections at home. | 02:56 |
| thumper | emmajane: yeah, I got a clean cat-5 cable from where the telephone line enters the house, and now goes through a main filter there, all the way to my router | 02:58 |
| emmajane | thumper: nice. | 02:58 |
| thumper | emmajane: not had any adsl problems since then | 02:58 |
| emmajane | thumper: maybe just generally the internet hates you? | 02:58 |
| thumper | emmajane: my hardware hates me more than the internet does | 02:59 |
| emmajane | heh | 02:59 |
| emmajane | thumper: also: my wireless card causes kernel panics as of a couple of weeks ago. that was handy while on the road. | 02:59 |
| thumper | heh | 03:00 |
| thumper | :( | 03:00 |
| emmajane | hence the eee | 03:00 |
| thumper | I'm going to make some cookies now | 03:00 |
| thumper | peanut brownies | 03:00 |
| emmajane | mmmcookies | 03:00 |
| emmajane | thumper: enjoy :) | 03:00 |
| thumper | emmajane: I will | 03:00 |
| emmajane | ´ | 03:02 |
| emmajane | hrm. /me spams the channel while she messses up her meta keys | 03:02 |
| emmajane | brb | 03:03 |
| lifeless | there is some confusion re: gsoc and ubuntu | 03:14 |
| lifeless | wait a few days | 03:14 |
| emmajane | yay! control-n control-p is your friend. | 03:15 |
| wgrant | emmajane: [Act: 1,2,4] shows the windows that have activity. | 03:15 |
| wgrant | Bold white means there's some new line of conversation. | 03:16 |
| * emmajane nods to wgrant | 03:16 | |
| emmajane | my alt key wasn't mapped corectly but someone at the sprint just toldme about control-n control-p | 03:17 |
| jelmer | from what I've heard (on the GSoC list) Ubuntu has withdrawn from GSoC | 03:17 |
| lifeless | jelmer: 'there is some confusion' | 03:18 |
| lifeless | jelmer: 'wait a few days' | 03:18 |
| jelmer | lifeless: that's different from "Ubuntu has withdrawn" | 03:18 |
| lifeless | jelmer: yes | 03:18 |
| jelmer | lifeless: The source here is Leslie, who is in charge of GSoC | 03:19 |
| lifeless | jelmer: I know | 03:19 |
| lifeless | jelmer: And yet, I'm saying that there is some confusion and you should wait a few days. | 03:19 |
| lifeless | not being the ubuntu gsoc contact myself, or leslie, I can't really say more | 03:20 |
| * emmajane really ought to read some of the backlog of the gsoc list. | 03:22 | |
| lifeless | s/say more/know more/ | 03:23 |
| emmajane | hrm. | 03:24 |
| emmajane | on the list from lh "Lime Survey has replaced Ubuntu." | 03:24 |
| lifeless | yes | 03:24 |
| emmajane | lifeless: but that is not necessarily the case? | 03:25 |
| lifeless | well clearly it is from LH's perspective, I have *no* idea on the Ubuntu front, other than people thinking we're in | 03:26 |
| lifeless | at the least there is confusion, at worst there is utter confusion and things will change | 03:26 |
| lifeless | its the weekend for doko, he's probably skiing or something | 03:26 |
| * emmajane nods. | 03:27 | |
| lifeless | the only thing I would bet on right now is that there is a lot of confusion | 03:27 |
| emmajane | lifeless: which is often not a good way to start a projec.t ;) | 03:28 |
| lifeless | there's nothing on ubuntu-devel, ubuntu-soc etc indicating a pull-out | 03:28 |
| * emmajane nods. confusion. | 03:28 | |
| igc | emmajane: as best I know, ubuntu was accepted | 03:37 |
| igc | otoh, I screwed up getting an application for bzr in on time, so we not, at least as a stand-alone project | 03:38 |
| igc | s/we/we're/ | 03:38 |
| emmajane | igc: aww :( | 03:39 |
| igc | it's very likely we'll do something though - either as part of ubuntu or just separately | 03:39 |
| emmajane | igc: but we don't know how many slots yet, do we? | 03:39 |
| * emmajane is helping out with the drupal one too very very peripherally. | 03:40 | |
| igc | emmajane: we do have a good list of project ideas put together - see http://bazaar-vcs.org/SummerOfCode2009 | 03:41 |
| igc | emmajane: so if you know anyone interested in doing those, students or otherwise, ask them to get in contact with me | 03:42 |
| * emmajane reads. | 03:43 | |
| emmajane | igc: drupal also has a VCS proposal, but I'm not sure what its status is. | 03:43 |
| emmajane | igc: have you been talking with any students yet? | 03:50 |
| emmajane | (regardless of ubuntu/bzr acceptance) | 03:51 |
| abentley | emmajane: That name doesn't ring a bell... | 04:01 |
| emmajane | abentley: formerly william o'higgins; friend of mike audet | 04:01 |
| emmajane | abentley: not sure on the spelling of mike's last name. | 04:01 |
| abentley | Oh, sure. He's good people. | 04:01 |
| emmajane | abentley: we went to uni together. | 04:02 |
| abentley | Cool. | 04:02 |
| abentley | Which uni? | 04:02 |
| emmajane | abentley: I'm actually in TO this weekend for a sprint. | 04:02 |
| emmajane | abentley: UofT. | 04:02 |
| abentley | Yeah, I went there too, that's how I met Mike, and therefore William. | 04:02 |
| emmajane | abentley: small. world. :) | 04:03 |
| emmajane | abentley: I was there 95-99. | 04:06 |
| abentley | emmajane: So how'd you find out I know William? | 04:08 |
| emmajane | abentley: he left a comment on my bzrvsgit post | 04:08 |
| emmajane | abentley: he likes bzr because of you | 04:09 |
| emmajane | abentley: and also because bzr is awesome | 04:09 |
| abentley | Ah. | 04:09 |
| abentley | Cool. | 04:09 |
| emmajane | yah | 04:09 |
| emmajane | and then someone else almost at the same time did one of those, You're both in canada do you know each other? things and... well..almost. :) | 04:10 |
| davidstrauss | Just posted fresh RHEL/CentOS packages for 1.13: http://fourkitchens.com/blog/2009/03/22/bazaar-113-rpms-rhel-5-centos-5 | 04:12 |
| lifeless | davidstrauss: did the tests pass then? | 04:15 |
| davidstrauss | lifeless: Still getting the file size mismatch failures | 04:15 |
| davidstrauss | lifeless: The scarier fails went away when running as non-root | 04:15 |
| lifeless | file size mismatch -> please do file a bug | 04:16 |
| === Ampelbein is now known as ampelbein | ||
| emmajane | night all! | 04:48 |
| lamalex | So everything i read about bzr says that it handles file renames with mv, but that does not seem to be the case in my branches | 04:57 |
| lifeless | lamalex: what do you mean by 'handles file renames with mv' | 04:58 |
| lamalex | lifeless: as in say foo.c is in my bzr tree, and i rename it to bar.c, if I do bzr stat the file is missing | 04:59 |
| lamalex | but the bzr docs, and things people tell me, say that bzr should reconizze the rename | 04:59 |
| lamalex | and i should see foo.c => bar.c | 05:00 |
| lifeless | lamalex: bzr doesn't do that; either do 'bzr mv foo.c bar.c' to do the move, or do 'bzr mv --after foo.c bar.c' to tell it afterwards | 05:00 |
| lifeless | the docs definitely don't claim a heuristic to figure that out | 05:00 |
| lamalex | what does it mean in http://bazaar-vcs.org/BzrFeatures | 05:01 |
| lamalex | first bullet in Intuitive | 05:01 |
| lifeless | lamalex: it means if you have a _branch_ you can rename the branch with mv | 05:01 |
| lamalex | ahh | 05:01 |
| lamalex | ok | 05:01 |
| lifeless | and cp will make a new branch | 05:02 |
| lamalex | right | 05:02 |
| lifeless | and rm will remove a branch | 05:02 |
| lamalex | i knew that | 05:02 |
| lamalex | thanks | 05:02 |
| lifeless | there is a plugin that will apply a rename-detecting heuristic | 05:04 |
| lifeless | abentley has been working on it, I don't know what its called or where to get it though :P | 05:04 |
| lamalex | oh yeah? | 05:04 |
| lamalex | ill google | 05:04 |
| lamalex | thanks | 05:04 |
| lifeless | he was doing it for the tarball import stuff; | 05:05 |
| lamalex | also, has there been some LP weirdness recently? | 05:05 |
| lamalex | its been getting stuck on "Transfering:Walking Content" | 05:05 |
| lamalex | a bunch of people in my project have seen it | 05:06 |
| lifeless | in bzr 1.13 we changed the pull/push logic to allow streaming which is much faster | 05:06 |
| lifeless | when bzr 1.13 is rolled out on the server you'll experience this | 05:06 |
| lamalex | but with 1.6(?) on the server pushes take forever? | 05:07 |
| lamalex | is the solution to just wait for the push to finish? | 05:07 |
| lifeless | 1.11 on the server, and yes | 05:07 |
| lamalex | ok | 05:08 |
| lamalex | thanks for your help | 05:08 |
| lifeless | the rollout is next week | 05:08 |
| lamalex | awesome | 05:08 |
| m3ga | give a file X in mu current directory, how do I tell if its under revision control or not? | 05:36 |
| lifeless | bzr status X? | 05:37 |
| lifeless | or bzr inventory | grep X if you want a brute force approach, or st X doesn't do what you want | 05:37 |
| m3ga | status says nothing, just returns | 05:37 |
| m3ga | "bzr inventory | grep X" just prints out X which I assume means that it is under revision control | 05:39 |
| lifeless | yes | 05:42 |
| m3ga | where do i lodge feature requests? | 05:43 |
| lifeless | bugs.launchpad.net/bzr | 05:43 |
| Peng_ | m3ga: If X is versioned and unchanged, "bzr status X" will print nothing and return. | 05:44 |
| m3ga | exactly which is why i submitted this feature request: https://bugs.launchpad.net/bzr/+bug/346624 | 05:48 |
| ubottu | Ubuntu bug 346624 in bzr "Feature request : fileinfo command" [Undecided,New] | 05:48 |
| m3ga | ah there it is | 05:48 |
| Peng_ | Well, actually, "bzr st ignored_file.pyc" will also exit with no output. Soo.. | 05:55 |
| === Spaz is now known as H1tler | ||
| === H1tler is now known as Spaz | ||
| m3ga | exactly. in the fetuare request I asked for four different catefories of output. there may be more. | 05:57 |
| m3ga | why does the lp: transport need my launchpad login? | 06:20 |
| m3ga | and then it goes ahead and does what i want anyway? | 06:21 |
| wgrant | m3ga: It needs your Launchpad username so that you can write to Launchpad, and also to use bzr+ssh to make things much faster. | 06:31 |
| wgrant | But it will fall back to read-only HTTP if you don't tell it your username. | 06:31 |
| lifeless | m3ga: because we haven't made every ui command indicate to the directory service if it needs a writable transport | 07:54 |
| lifeless | m3ga: and launchpads http mirrors are read only | 07:54 |
| m3ga | lifeless: i'm just a dumb-fsck user and you're telling me about lowlevel implementation details? :-) | 07:55 |
| lifeless | m3ga: asif :P | 07:56 |
| m3ga | i think this is actually a real failing of all dvcs. the problem is very hard and that difficulty ends up leaking into the user interface | 07:57 |
| lifeless | m3ga: We can do better here, but ETIME. | 07:57 |
| lifeless | this part isn't particularly hard - merge (for instance) never needs a writable remote transport, push does, branch's target does etc | 07:58 |
| m3ga | you're already doing well but i'm gonna keep beating you up about it, because too many people (esp git users) don't even realise that this problem exists | 07:58 |
| lifeless | oh sure | 07:59 |
| lifeless | long as you keep using bzr you can keep beating me up :) | 07:59 |
| m3ga | i did a fast-import into git today. a whole fscking world of surprises :-) | 07:59 |
| lifeless | indeed | 08:02 |
| lifeless | but it gives them to you fast | 08:02 |
| lifeless | ciao | 08:03 |
| vila | lifeless: I think I fixed that roughly by the time you mentioned it and laughed a bit doing that thinking about *you* laugh seeing my mistake :-P (The less funny part was realizing this wasn't covered by a test...) | 08:37 |
| vila | lifeless: next step as I see it: add a test runner registry to bzr and register subunit/forked/subprocess there from a plugin that could die when each runner find its natural home, that left the problem of additional parameters to these runners open though. | 08:44 |
| lifeless | vila: I've pushed new stuff; I don't see subunit/forked/subprocess as runners... | 08:59 |
| alf | Hello, I have been experiencing some strange slowness (that wasn't present before) when trying to push a branch to lp. | 10:12 |
| alf | I am using bzr-1.13rc1 (from debian unstable). | 10:12 |
| alf | The local branch is in a shared repository with rich-root-pack format. | 10:14 |
| lifeless | alf: there is new streaming code in 1.13 | 10:15 |
| alf | When trying to push a branch to lp which includes small changes (eg two added 100-line files) the push takes about 2:30 minutes with constant ~50 kb/s upload | 10:15 |
| lifeless | alf: which lp hasn't deployed yet, but bzr gets too far down the code path to use the local-filesystem optimised path | 10:15 |
| lifeless | alf: on thursday there is a rollout of 1.13 to lp, it will get massively faster for you then | 10:16 |
| lifeless | <gone again> | 10:16 |
| alf | lifeless: ok, thanks! I will just be patient then :) | 10:17 |
| === Ampelbein is now known as ampelbein | ||
| === d6g|away is now known as d6g | ||
| === epsilon_0 is now known as princess_liah | ||
| === princess_liah is now known as epsilon_0 | ||
| === abentley1 is now known as abentley | ||
| === nekohayo_ is now known as nekohayo | ||
| === d6g is now known as d6g|away | ||
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| vila | <lifeless> I don't see subunit/forked/subprocess as runners... | 15:25 |
| vila | Why ? | 15:25 |
| vila | lifeless: nm, just got you rmail | 17:12 |
| LarstiQ | arrr | 17:15 |
| jelmer | LarstiQ: yarrrrrr | 17:16 |
| LarstiQ | jelmer: what identi.ca client do you use? | 17:18 |
| * LarstiQ tried TwitterVim | 17:18 | |
| jelmer | LarstiQ: I use the haskell one and gwibber | 17:19 |
| jelmer | twidge | 17:19 |
| LarstiQ | jelmer: ooh, twidge is actually in lenny | 17:20 |
| === abentley1 is now known as abentley | ||
| === d6g|away is now known as d6g | ||
| Leon_Nardella | leon@bespin:~/Desktop/bzrtools$ bzr shell | 19:57 |
| Leon_Nardella | bzr: ERROR: [Errno 2] No such file or directory | 19:57 |
| Leon_Nardella | What am I doing wrong? | 19:57 |
| Leon_Nardella | ( Er.. It works in my home ¬¬ ) | 19:57 |
| LarstiQ | Leon_Nardella: does ~/.bzr.log provide a hint? | 19:58 |
| Leon_Nardella | LarstiQ: I went to my home then back to the folder I was and now it's working.. Really weird. | 19:58 |
| LarstiQ | Leon_Nardella: did the directory still exist? | 19:59 |
| Leon_Nardella | Yes. | 19:59 |
| LarstiQ | Leon_Nardella: ie, did you delete or mv it between cd'ing there and starting bzr shell? | 19:59 |
| LarstiQ | (so, inode, not path) | 19:59 |
| Leon_Nardella | No, no. | 19:59 |
| LarstiQ | hmkay | 20:00 |
| Leon_Nardella | http://paste.ubuntu.com/135571/ | 20:00 |
| Leon_Nardella | The interesting part from the log. | 20:00 |
| Leon_Nardella | http://paste.ubuntu.com/135572/ | 20:01 |
| Leon_Nardella | Now it's like this. | 20:01 |
| LarstiQ | as I thought, it's the 'get current working directory' call that returns 'No such file or directory' | 20:02 |
| Turl | hi | 20:17 |
| Turl | I had a typo on a commit message, can I fix it somehow? | 20:17 |
| Turl | I still didn't push the message | 20:17 |
| Turl | s/message/revision/ | 20:17 |
| LarstiQ | Turl: bzr uncommit; bzr commit | 20:21 |
| Turl | thanks LarstiQ | 20:22 |
| Turl | LarstiQ: it doesn't change the code, does it? | 20:22 |
| LarstiQ | Turl: no, it leaves the tree state the same, but sets the branch to point at a prior revision | 20:23 |
| LarstiQ | Turl: so if you then commit, you end up with a revision where only the commit message is different (well ok, the timestamp, revision id, maybe committer name if you changed that inbetween) | 20:24 |
| LarstiQ | Turl: basically, you can fix mistakes like that :) | 20:24 |
| Turl | ok LarstiQ, thanks :) | 20:24 |
| mwhudson | so for my development version of loggerhead, viewing a revision page that adds 9000 files doesn't stress loggerhead too much | 20:35 |
| mwhudson | ff, on the other hand... | 20:36 |
| LarstiQ | mwhudson: yeah. I ditched ff(3) because it made my entire system unusable (sloow ssd + sqlite fsync + ext3 = hsd) | 20:38 |
| mwhudson | LarstiQ: what do you use instead? | 20:38 |
| LarstiQ | mwhudson: opera for now, since I have two colleagues idolizing it. | 20:39 |
| LarstiQ | I don't care too much for the browser, but at least the rest of my system is usable. | 20:39 |
| Turl | LarstiQ: believe it or not, opera is real slow in here :p | 20:40 |
| mwhudson | LarstiQ: how does it do on the "fills one with burning rage" metric? | 20:40 |
| Turl | that's why I use firefox | 20:40 |
| LarstiQ | mwhudson: it scores a 3. But I haven't been using it very long. | 20:40 |
| mwhudson | the first versions of ff3 were so fast | 20:41 |
| mwhudson | what happened? | 20:41 |
| LarstiQ | mwhudson: let me look up two urls that hit me | 20:42 |
| LarstiQ | meh, logging | 20:46 |
| LarstiQ | mwhudson: https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/317781 I believe | 20:46 |
| ubottu | Ubuntu bug 317781 in linux "Ext4 data loss" [High,Fix released] | 20:46 |
| LarstiQ | mwhudson: and from there a mozilla person blogpost | 20:46 |
| LarstiQ | mwhudson: http://shaver.off.net/diary/2008/05/25/fsyncers-and-curveballs/ | 20:47 |
| mwhudson | LarstiQ: that doesn't really explain why ff3 has gotten worse IME | 20:49 |
| mwhudson | maybe it's just that my awesomebar.db or whatever is larger now | 20:50 |
| LarstiQ | mwhudson: I don't know what got introduced when. | 20:50 |
| LarstiQ | mwhudson: for me, I've only been using this Acer Aspire One since the second half of January | 20:51 |
| LarstiQ | and I think I know why Acer ships FF2 by default.. | 20:51 |
| wgrant | mwhudson: I was able to speed things up a lot of trimming and vacuuming the SQLite DBs. | 20:51 |
| wgrant | s/of/by/ | 20:51 |
| wgrant | I wonder if Firefox can be taught to use a RDBMS that doesn't suck. | 20:52 |
| LarstiQ | wgrant: hmmm | 20:52 |
| mwhudson | wgrant: i think an oracle license for every ff user would get a bit expensive! | 20:53 |
| * mwhudson runs away, terribly fast | 20:53 | |
| * wgrant trips mwhudson. | 20:53 | |
| * LarstiQ dumps 'no we don't store support vectors for linear kernels' on mwhudson | 20:54 | |
| garyvdm | I think they have been working on the performance of the awessomebar for ff3.5 | 20:55 |
| wgrant | At least Firefox never gets as slow as OOo. | 20:55 |
| CBro2007 | hi all, if I wanted to use bzr to create a trunk and some branches.. would I have to physically copy files to a directory like "myRepository/trunk" and then issue bzr init? | 21:30 |
| CBro2007 | is that how it works? | 21:30 |
| CBro2007 | also you think its a good idea to setup a "bzr" user on my CentOS machine so people with different accounts and userids can access it? | 21:30 |
| CBro2007 | anyone? :) | 21:31 |
| CBro2007 | wow no one helps out in this channel eh? | 21:35 |
| CBro2007 | silence is the key | 21:35 |
| mwhudson | CBro2007: um | 21:35 |
| mwhudson | for the first, yes, i think you're right | 21:36 |
| CBro2007 | ok | 21:36 |
| mwhudson | for the second, well, it depends what you're trying to acheive | 21:36 |
| CBro2007 | well this is what I want... | 21:36 |
| CBro2007 | I got a bunch of project files on a shared server that I want to share with 3 other developers | 21:36 |
| CBro2007 | they all have their own unix accounts on this machine | 21:37 |
| mwhudson | with you so far | 21:37 |
| CBro2007 | am wondering if there will be any problems if I am the owner of the trunk etc | 21:37 |
| mwhudson | ah | 21:37 |
| CBro2007 | like the file ownerships would be in my name because I did an init-repo or something | 21:37 |
| mwhudson | i think you could probably use a unix group for this | 21:38 |
| CBro2007 | so I want to give some thought to the dir sructure before I launch off | 21:38 |
| CBro2007 | I have setup a UNIX group to which we all belong | 21:38 |
| CBro2007 | :) | 21:38 |
| CBro2007 | so if I was to do this... | 21:39 |
| mwhudson | then, so long as you use g+s or whatever the chmod thing is, i think it'll work alright | 21:39 |
| CBro2007 | bzr init-repo myRepository | 21:39 |
| CBro2007 | then create a dir for my project under there | 21:40 |
| CBro2007 | and then under that project create a dir called TRUNK to which I copy all the original project code | 21:41 |
| CBro2007 | ? | 21:41 |
| CBro2007 | right so far? | 21:41 |
| mwhudson | yes | 21:41 |
| CBro2007 | ok... | 21:41 |
| mwhudson | often times people create a repo per user, rather than all sharing the same repo | 21:41 |
| mwhudson | and in addition have a central repo from where releases/rollouts are made | 21:42 |
| CBro2007 | mwhudson: is this recommended? | 21:42 |
| mwhudson | it depends on your workflow really | 21:42 |
| CBro2007 | mwhudson: I suppose I am not super sure as to how we will MERGE our changes etc | 21:42 |
| === ampelbein is now known as Ampelbein | ||
| CBro2007 | mwhudson: just don't want people stuffing up the GOLD COPY you know | 21:42 |
| CBro2007 | :) | 21:42 |
| mwhudson | CBro2007: one of the nice things about bzr is that it makes many decisions that are technical with, say, svn, social | 21:43 |
| CBro2007 | how do you mean sorry? | 21:43 |
| mwhudson | CBro2007: unfortunately this means that the answers to many questions become "um, well, it depends" :-p | 21:43 |
| CBro2007 | you mean it supports a lot of kind of workflows? | 21:44 |
| mwhudson | CBro2007: what version control do you use now? | 21:44 |
| mwhudson | CBro2007: yes | 21:44 |
| CBro2007 | used SVN and CVS in the past | 21:44 |
| mwhudson | CBro2007: for "protecting the gold copy", there is PQM, which is a robot that merges branches for you | 21:44 |
| CBro2007 | want to move away from it to the distributed version control and enforce it amongst other developers alike | 21:44 |
| mwhudson | and it can be configured to run tests before it accepts a branch | 21:44 |
| CBro2007 | Nah I would like to do that manually | 21:45 |
| mwhudson | hang on, there must be a wiki page about this stuff | 21:45 |
| CBro2007 | myself | 21:45 |
| CBro2007 | ok | 21:45 |
| CBro2007 | I think I remember reading that in the user guide.. where you have a gateway keeper or something that can automate the merges | 21:45 |
| CBro2007 | I just want it a bit simpler where developers let me know when they think their branch is ready for a merge to the trunk | 21:45 |
| mwhudson | CBro2007: http://bazaar-vcs.org/Workflows | 21:46 |
| CBro2007 | and then I can do it | 21:46 |
| mwhudson | CBro2007: sounds like http://bazaar-vcs.org/Workflows#head-f5c9069eb3a6991f31e6b909dbb3fb12a45f34a5 | 21:46 |
| CBro2007 | you mean centralized? | 21:47 |
| CBro2007 | I think I want the decentralized with human gatekeeper | 21:48 |
| CBro2007 | I like that workflow best | 21:48 |
| mwhudson | CBro2007: no, "decentralized with human gatekeeper" | 21:48 |
| mwhudson | right | 21:48 |
| garyvdm | From what you said - I think Decentralized with human gatekeeper | 21:48 |
| mwhudson | that seems to be basically exactly what you're describing | 21:48 |
| CBro2007 | Yeah :) | 21:48 |
| garyvdm | haha | 21:48 |
| CBro2007 | thats what I want | 21:48 |
| mwhudson | :) | 21:48 |
| CBro2007 | wow now how do I set this model up | 21:49 |
| CBro2007 | this is exactly what I want to do | 21:49 |
| CBro2007 | but the model doesn't show me a step by step scenario of how to do it :) | 21:50 |
| CBro2007 | was wondering if I need to even use launchpad or can I just merge stuff locally | 21:51 |
| CBro2007 | as it will all really just be UNIX accounts on the same machine | 21:51 |
| mwhudson | you certainly don't need to use launchpad | 21:51 |
| mwhudson | the docs are probably tilted towards open source-y things | 21:51 |
| CBro2007 | so is there a link that runs you through a scenario of how to setup that model? | 21:53 |
| CBro2007 | I mean how do I setup a "read-only" access to the MAIN branch | 21:53 |
| CBro2007 | and how do developers REQUEST MERGE? | 21:54 |
| CBro2007 | mwhudson: cmon man don't leave me hanging there? :) | 21:55 |
| mwhudson | CBro2007: well, if you make the trunk branch rwxr--r-- | 21:55 |
| CBro2007 | ah with UNIX permissions | 21:55 |
| mwhudson | that's good enough for read only | 21:55 |
| mwhudson | <CBro2007> and how do developers REQUEST MERGE? | 21:55 |
| mwhudson | this is what i meant by a social question :) | 21:56 |
| mwhudson | they can email you a merge request using bzr send | 21:56 |
| CBro2007 | whats the social qn part? | 21:56 |
| CBro2007 | hmm so there is no formal process of requesting a merge? | 21:56 |
| mwhudson | CBro2007: it depends on how you interact as a team | 21:56 |
| CBro2007 | really well :) | 21:56 |
| mwhudson | CBro2007: not in bazaar, no | 21:56 |
| mwhudson | CBro2007: you can use launchpad merge proposals, if you use launchpad | 21:56 |
| CBro2007 | so if they did say ... well I just completed a feature and it looks great in my branch... ready to merge... what do I do next? | 21:57 |
| mwhudson | if you aren't using launchpad, why not just use email? | 21:57 |
| CBro2007 | yeah we can e-mail | 21:57 |
| mwhudson | bundlebuggy can make using email a bit more structured | 21:57 |
| CBro2007 | ok I can look into that | 21:57 |
| CBro2007 | but what I meant was that how do we keep the branches and the MAIN trunk/branch in synch? | 21:58 |
| CBro2007 | once I have reviewed their changes I want to merge their stuff into the GOLD COPY.. but then I am sure they want to be able to UPDATE their copies as well | 21:58 |
| CBro2007 | so they would probably also want to SHARE code between OUR branches... not necessarily having to merge into TRUNK | 21:59 |
| CBro2007 | does that make sense? :) | 21:59 |
| lifeless | CBro2007: these are all things bzr supports | 21:59 |
| lifeless | CBro2007: I have a suggestion for you: simulate this yourself, just make a toy branch, like 'hello world' or something, an dplay with merging committing branching pushing etc | 21:59 |
| CBro2007 | lifeless: yeah just wasn't sure how a command like "bzr merge" would do the trick... as it doesn't seem to have a source or a target mentioned in it | 22:00 |
| lifeless | don't worry about server setup or anything else until you have a feel for how the tool is for a user | 22:00 |
| lifeless | CBro2007: have you read the quickstart guide ? | 22:00 |
| CBro2007 | ;Yeah I was going to do that tomorrow | 22:00 |
| CBro2007 | Yep | 22:00 |
| lifeless | so have a look at 'bzr help merge' | 22:00 |
| CBro2007 | you ar right... let me fiddle with it | 22:00 |
| lifeless | it has examples of merging :) | 22:01 |
| CBro2007 | yep reading | 22:01 |
| CBro2007 | anyway got to go now | 22:01 |
| CBro2007 | thanks for the help guys | 22:02 |
| CBro2007 | take care! | 22:02 |
| CBro2007 | bye | 22:02 |
| ToyKeeper | toy branches ++ | 22:02 |
| * ToyKeeper got a blue tab on 'toy' | 22:03 | |
| jml | lifeless: re bug 345169 -- did I see a patch for that on the list? | 22:20 |
| ubottu | Launchpad bug 345169 in bzr "bzr push to a new lp branch of bzr from a local copy fails to stack" [Critical,New] https://launchpad.net/bugs/345169 | 22:20 |
| lifeless | jml: yes | 22:21 |
| lifeless | jml: and is in bzr.dev already | 22:25 |
| jml | lifeless: cool. | 22:25 |
| jml | lifeless: shall I mark it as Fix Released? | 22:25 |
| lifeless | r3174 | 22:26 |
| lifeless | 4174 | 22:26 |
| lifeless | yes | 22:26 |
| jml | thanks. | 22:32 |
| poolie | hello jml, lifeless | 22:37 |
| lifeless | hi poolie | 22:38 |
| jml | poolie: good morning | 22:38 |
| lifeless | kfogel: ping | 22:38 |
| lifeless | spiv: if you want to get together at my place today, that would be cool; if so just pop on over anytime | 23:31 |
| spiv | lifeless: ok, will let you know | 23:34 |
| spiv | Hmm, caffiene time. | 23:34 |
| igc | morning all | 23:35 |
| * garyvdm fights with qt to get QComboBox to do what I need it to do. | 23:57 | |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!