=== Adam|Lunch is now known as AdamDV [03:23] I already have a branch called testingbzr. How do I create a new branch to put the real code? [03:24] I use launchpad btw [03:28] anyone? [03:32] blueglasses: you have a branch locally already? [03:33] blueglasses: if so, just push it to where you want it to be on launchpad, e.g. "bzr push lp:~username/projectname/new-branch" [03:33] i dont think so, let me check [03:33] Well, perhaps I'm misunderstanding what you're asking. [03:34] What do you mean by "create a new branch"? You mean start a new branch from scratch, with no prior history? [03:34] locally i have /home/user/python/projectname/files [03:35] And is that directory already versioned in bzr? [03:35] i think so [03:35] "bzr info" or "bzr log" or whatever would confirm that if you like. [03:35] i'm not a native english speaker sorry for my delay [03:35] That's fine! [03:36] I can only speak one language, so I'm already impressed :) [03:36] I'm trying to use bazaar explorer [03:37] how do I create a new branch... I might have done something wrong [03:37] my project name in lauchpad is "story" [03:37] Ok. I don't know explorer well, but you should be able to do something like "bzr commit" to make a new commit, and then "bzr push" to publish those changes. [03:37] that far i have done already [03:38] but I'm commiting to a branch called bzrtesting [03:38] I see, you have lp:~lapisdecor/story/testingbzr already. [03:39] Oh, when you commit the changes are automatically going to lp:~lapisdecor/story/testingbzr ? [03:39] yes [03:40] and I wanted a new branch to put the real code (when it will come done) [03:40] Ok, you have what we call a 'checkout' rather than a 'branch'. It's really just a local branch configured to automatically update a remote branch at the same time. [03:40] I have to push after commit [03:40] to get the stuff there [03:40] Oh, then it's not a checkout, just a branch. [03:41] Which is fine. [03:41] actually I just dont like the name 'testingbzr' [03:41] Ok, you can rename that. [03:42] i would like to keep it to learn bzr but i would like a new branch to put the real code [03:42] If you go to https://code.launchpad.net/~lapisdecor/story/testingbzr/+edit you can change the name. [03:43] Or you can ignore that old branch on Launchpad and tell bzr explorer to push to a new location with the name you want. [03:43] that one sounded better [03:43] (To create a new branch on Launchpad you simply push to it. There's no need to register it or initialise it first.) [03:43] cool [03:44] so I can call it main [03:45] ok I will try to make some code and then push it to a new branch [03:46] thank you so much for the help, still a noob here, but with good heart :-) [03:46] time to bed now [03:46] blueglasses: good night [03:47] good night [05:50] hi all [07:09] Hi all [07:14] hi all ! [07:15] hi GaryvdM , poolie [07:15] poolie: feeling better ? Still here ? [07:15] * GaryvdM _o/ @ vila [07:15] :) [07:15] GaryvdM: I wonder whether you're creative in online glyphs or starting coding in perl :) [07:16] Huh? [07:17] _o/ @ sounds like noise, aka perl code from the pov of people unaware about perl conciseness ;) [07:17] hi vila, i am better now [07:17] vila: ah :-) [07:18] it does look like perl, or haskell [07:18] cool [07:18] Hi vila [07:18] Hi poolie [07:21] hi gary [08:56] mgz: yep, landing something on trunk sorted out the merge proposals that lp hadn't yet noticed were merged. === Guest86531 is now known as jelmer [09:13] hey GaryvdM, poolie, vila, spiv [09:13] jelmer: hi ! [09:14] spiv: wanna talk about https://code.edge.launchpad.net/~spiv/bzr/checkout-tags-propagation-603395-2.2/+merge/40406 ? Or should we do that earlier tomorrow ? [09:15] jelmer: any feedback about the above ? [09:19] vila: you mean the checkout tags propagation? [09:20] Ah, I guess so. [09:20] jelmer: yup, the impact of bzr-svn or other foreign plugins in particular, the mp is targeted at lp:bzr/2.2 [09:20] * jelmer has a quick look [09:20] s/impact of/impact on/ [09:23] vila: The way backwards compatibility is handled looks reasonable to me; I can do some testing later today if that would be useful. [09:23] jelmer: yes it would and would be appreciated ;) [10:54] Hello, quick question, what does bzr do with illegal chars in filenames on windows, example, on linux I use 'stupid: name' what would happen on windows? [11:02] Excitement! [13:14] hello hello [13:14] any bzr devs around? [13:14] * beuno stares at vila [13:19] hooo beuno ! [13:19] forgive me I was having a small lunch, just back :) [13:20] hai vila! [13:20] how's it going? [13:20] better :) [13:20] I have this horrible bzr traceback: https://pastebin.canonical.com/39793/ [13:20] but other than that, good [13:20] better than who? :) [13:21] that, my friend, is very bad (the traceback) [13:21] better than me yesterday :) [13:21] I was already good yesterday :) [13:22] you been sick? [13:22] beuno: what bzr version are you using (packaged ? from sources ?) [13:22] beuno: no no, just getting better every day :) [13:22] vila, stock maverick [13:22] no funny business [13:22] ok [13:22] hmm [13:23] bzr info -v [13:23] trying to find progressive checks [13:23] bzr check (this one could take time) [13:23] branching from the revision just before the commit [13:24] Hi beuno - How come not a public traceback pastebin? [13:24] beuno: fs fail? [13:24] bzr: ERROR: zlib.error: Error -3 while decompressing data: invalid distance too far back === Ursinha-afk is now known as Ursinha [13:24] lifeless, no visible fs failures that I know of [13:24] Thanks lifeless [13:24] hi GaryvdM, it's a private branch, so was lazy and pasted it in private instead of making sure I wasn't leaking anything :) [13:24] sorry about that [13:25] beuno: np [13:25] beuno: number and size of pack files [13:25] vila, http://paste.ubuntu.com/532994/ [13:26] beuno: I should have started with: this is gzip telling us that the data is corrupted which is unseen so far except when related to fs failue [13:26] failure [13:26] vila, http://paste.ubuntu.com/532995/ [13:26] ah [13:27] I have plenty of space [13:27] beuno: then start with a backup [13:28] 467 Nov 16 09:25:17 beuno-laptop kernel: [1497398.983861] EXT4-fs (sda1): re-mounted. Opts: errors=remount-ro,commit=600 [13:28] beuno: at least the repo (which should be enough) [13:28] 468 Nov 16 09:25:31 beuno-laptop kernel: [1497412.578739] EXT4-fs (sda1): re-mounted. Opts: errors=remount-ro,commit=0 [13:28] that's the only thing I see [13:28] beuno: it might not be this boot [13:29] beuno: there are a few options : [13:29] - corrupt disk [13:29] - memory bit error [13:29] beuno: md5sum your packs [13:29] and check the sums match the pack names [13:29] we really should have that in core [13:29] * beuno checks [13:32] lifeless, they all match [13:32] oh, my bad [13:32] its in an index. [13:32] http://paste.ubuntu.com/532998/ [13:32] one of your indices is naffed [13:33] so, these *.six/tix/rix? [13:41] voidspace: yes [13:41] bah [13:41] beuno: yes [13:47] lifeless: so 'bzr pack' time ? Or do we use the indices for that ? [13:58] vila, lifeless, so, do I have a way out of this? [13:59] beuno: if you did a backup, try 'bzr pack; [13:59] beuno: if you did a backup, try 'bzr pack' [13:59] I'll backup now [14:04] vila, packing! [14:06] vila, same tb [14:07] wow [14:07] vila, http://paste.ubuntu.com/533014/ [14:08] ah, during the pack [14:08] to be expected [14:08] pack has to read data :) [14:08] bzr dump-btree can help you find the damaged index [14:09] yeah, I expected he could rebould the indices from the packs :-/ [14:09] s/expected/hoped/ [14:09] which is what we need [14:10] no [14:13] oh good [14:13] so, run bzr dump-btree? [14:19] beuno: yes, starting with the .cix indices as they seem to be the ones causing problem (from the tb) [14:20] lifeless: you still haven't elaborate on this 'no' [14:20] vila: the indices have unique data [14:21] urgh, still ? [14:21] vila: until we fix it [14:22] vila, so run that command against each .cix? [14:22] yes [14:23] beuno: quick check: you don't have *empty* indices right ? [14:24] vila, let me look [14:24] lifeless: but then there is probably no escape for beuno other than recreating its repo from scratch (or almost) ? [14:24] indeed [14:24] vila, all of them ahve more than zero bytes [14:24] ah [14:24] ok [14:24] that sounds fun [14:24] :-/ [14:24] I guess I can re-branch from launchpad [14:25] restore from backup :) [14:25] do you want this bug reported? [14:25] it's a few hundred mb, so not terrible [14:25] you've had a fs glitch, for sure. [14:25] its not a sync-crash, or you'd have an empty index. [14:25] okk [14:25] you've either got a bad memory dimm - in which case rebooting may fix this. [14:25] beuno: let see if we can isolate which index is the culprit [14:25] so maybe I need to run fsck [14:25] vila, sure [14:26] or you've got a bad block which lost data [14:26] * beuno nods [14:26] I can try rebooting [14:26] I haven't done that in a few weeks [14:26] note that if reboot does not fix it, it doesn't mean that the block is bad - a bad dimm that results in a bad write is indistinguishable (except via disk read stats) [14:27] ok, I'll let you know in 2 minutes [14:30] re-packing... [14:30] 3/7 === Ursinha is now known as Ursinha-lunch [14:31] beuno: you've connected from another pc ? [14:32] s/'ve/'re/ [14:32] IRC proxies ftw :-) [14:33] vila, no, irss + ssd disk [14:33] reboot in 12 seconds [14:33] 4/7 [14:33] I think ti's fixed [14:33] because it's way further than before [14:33] let's wait [14:40] 6/7 [14:41] vila, lifeless, reboot made pack work [14:42] so thank you :) [14:42] beuno: retry commit now [14:42] beuno: replace your memory. [14:42] vila, commit worked [14:42] beuno: I won't feel secure *at all* if I were you :-/ [14:43] lifeless, remote hardware diagnosing, this is a new one for me! [14:43] vila, I should be able to replace the ram fairly quickly [14:43] 99% of what I care about is on the interwebs [14:43] so i'll backup the remaining 1% and turn on paranoid mode [14:43] ha, I feel better then :) [14:43] thank you much! [14:49] morning all === jam1 is now known as jam [14:49] Hi jam! [14:49] hi GaryvdM === Ursinha-lunch is now known as Ursinha === zyga is now known as zyga-afk [15:43] is there to way to merge 2 commits seperated by other commits? [15:43] i got c1,c2,c3,c4/head, where cX stands for commit with number X and head for the tip or whatever you bzr guys calls [15:43] call* [15:43] i want to somehow put the changes from c4 into c1 [15:45] txdv: It doesn't make sense to talk about putting changes from one commit "into" another commit. What would you expect it to look like? [15:46] well i got a fucking commit nazi in my work force [15:46] and whenever there is an additional empty line added by accident [15:46] he forces me to rewrite the complete history [15:47] So let's just pick a scenario like, i need to remove a simple line in a past commit [15:47] adding just another commit fixing exactly that issue won't help [15:51] txdv: Sounds like you want rebase... [15:52] or a tire iron [15:52] Odd_Bloke: this scenario doesn't include diverged trees at all [15:53] Or can you explain how to incorporate the changes from c4 into c1 with rebase? [15:54] txdv: wow, I feel your pain (I do a a lot of typos and my histories are nothing close to linear) [15:54] txdv: so roughly you wan to cherry-pick and may be with luck use a bit of rebase [15:54] txdv: so you start with a "clean" branch [15:55] txdv: then you cherry-pick 'bzr merge ../dirty -c<1>' 'bzr merge -c<4>' [15:56] txdv: -c<4> is a shortcut for -r3..4 [15:56] txdv: and rebase should do for 2 and 3 [15:57] txdv: 'bzr revert --forget-merges' if for whatever reason you need to commit changes without tracking where they come from [15:58] awesome [16:00] txdv: ... or may be you just do a single big commit with the --forget-merges trick above, after all if "he" doesn't care about history "he" may even prefer that :-/ [16:01] that motherfucker is uncommiting shit from trunk all the time because of the history [16:01] even his own commits [16:01] right, but let's just try to watch our language here :-D You're welcome to express your pain otherwise ;) [16:02] txdv: may be 'bzr merge --interactive' can help you too ? [16:04] ill look into it [16:04] the checkout the cherry picking first [16:07] thanks again [16:11] anytime ;) [16:12] this dude is ridicolous [16:12] he forces me to rewrite the history on my branch [16:12] yet he puses right away to the trunk and uncommits it after a while [16:16] the uncommit is very damaging if the branch is shared :-/ [16:17] txdv: You can turn on append-revisions-only so that he can't uncommit. [16:18] O i already spent 2 hours of debugging stuff because i thought my merge messed up, while he uncomited his bad commit meanwhile [16:18] txdv: may be you should start using qlog and its ability to hide lower level commits (have a look at the bzr history) [16:18] GaryvdM: on launchpad too? [16:19] txdv: Yes - easy with the new bzr config command, with out, you need to modify the branch config with sftp [16:20] GaryvdM: wow, I didn't thought about using 'bzr config' for that ! Did you try it ? (/me frantically notes to add tests for remote branches) [16:21] vila: no - I just assumed. Will test now. [16:21] GaryvdM: I'm just silly, I made sure you can *read* remote configs and then totally forget you can update them too :) [16:21] where can i get this qlog? [16:21] txdv: it's part of the qbzr plugin [16:21] txdv: it's part of the qbzr plugin. What os are you using? [16:21] txdv: what OS/distro version are you... [16:21] damn GaryvdM [16:22] :) [16:22] y i already got it installed [16:22] debian i am using: apt-get install qbzr === You're now known as ubuntulog [16:28] txdv: less than one minute between 'where can i get' and 'got it installed'... [16:31] i did a 'aptitude search qlog' after you mentioned qlog [16:31] couldn't find it, therefore i thought it was not in the deb repos [16:32] still, I'm always amazed by how easy it can be to get the right tools... [16:32] not with windows [16:32] windows is a timewaste [16:33] 2hours in order to install visual studio on a brand new machine [16:33] right, you need a good packaging community, that was my point ;) [16:33] actually im not too happy with the unix way of directory structure [16:33] the only thing that you should do in order to install a programm is to unzip it in a directory [16:33] or untar [16:34] but they tried that with SunOS and you end up with nightmearish PATH MANPATH LD_LIBRARY_PATH and so on [16:34] and that doesn't even start addressing compatibility and dependencies... [16:35] OSX did it [16:35] sort of kind of. [16:35] right, but user-facing apps only [16:35] the problem with linux is the compatibility [16:35] yeah, agree, sort of kind of, the .app is very nice, don't get me wrong though [16:35] everything changesi n the system [16:35] vila: can't say i'm a fan, really [16:36] Yhea - That's one of the things that bugs me with windows, is adding to PATH, and adding to PATH, and adding to PATH.... [16:36] they should automatically check programm\*\bin [16:36] why path? [16:36] dash: it's pretty cool to be able to test an app and throw it away without worrying about hidden dependencies though (I know, I know there are exceptions) [16:37] vila: CDE enables one to build and run standalone apps with all dependencies [16:37] CDE, you mean the CDE in Solaris or something else ? [16:38] but anyway, the problem starts when you want to share libraries [16:38] or any other kind of resources [16:38] http://goo.gl/h6IP3 [16:40] Sounds like a guaranteed way to mean you don't have to write portable code, and a huge resource waste. [16:40] N.B. Not portable code is probably bad code. [16:41] if you just want to get shit running on an old machine it is good enough [16:41] hehe, right, but I like my machines to be lean and clean ;) [16:41] So's Debian. :p === You're now known as ubuntulog_ [16:44] note the 'S' here, I think I'm currently maintaining ~5 physical and ~15 virtual machines and I don't want to *debug* them :) === You're now known as ubuntulog [16:50] Of course not. When you need to, you just bug me :p [16:50] hehe, I wish I can do that for all of them ;) [16:51] Oh, you totally can. "I found the problem with this one, it's running a weird OS..." [16:51] lol, yeah *that* will apply to *all* of them :) [16:52] * fullermd wonders if you have the test suite running on Plan 9... [16:52] * vila searches for a Plan9.iso [16:53] there is one ! :D [16:53] I wonder if anybody's ever tried using bzr on it. [16:53] is there a python there to start with ? [16:54] No idea. [16:54] I'd assume it's popular enough (and near enough to POSIX in various ways) that perl and python both exist on it. [16:55] But I've been wrong before. Occasionally. And after I killed all the witnesses, it never REALLY happened... === zyga-afk is now known as zyga [18:13] ? [18:16] hi SimonK [18:17] Hi SimonK [18:18] hey Gary [18:21] Hi jelmer [18:21] ubot: tell me about bug #647204 [18:21] Launchpad bug 647204 in QBzr "qbrowse show log crashes: AttributeError: 'BzrBranch7' object has no attribute 'startswith' (affected: 3, heat: 26)" [High,Confirmed] https://launchpad.net/bugs/647204 [18:23] SimonK: Ok - I don' [18:23] bzr: ERROR: Unsupported protocol for url "git://perl5.git.perl.org/perl.git <== Did I do something wrong, or is it not supported? [18:24] SimonK: Ok - I don't like it when the bug just goes away, so I'll try reproduce it in older revisions. [18:24] SimonK: Thanks for testing. [18:25] LeoNerd: no, that works [18:26] LeoNerd: oh, and we're thinking thursday in the office here [18:26] Righty.. I'm busy this end Thursday I think.. :/ but never mind... [18:26] maxb: Well, it doesn't work for me.. ;) [18:26] I assume you just don't have bzr-git and/or dulwich installed [18:26] Oh. Duh! I was sure I had installed it :p [18:26] EWRONGMACHINE [18:27] Hmm, what's Wednesday like for you, we are vacillating as usual [18:27] * LeoNerd admits user error, returns to lurking in the shadows [18:27] Oh... OK... now dulwich won't install... massive "SyntaxError" complaints [18:27] ! [18:27] pastebin? [18:27] http://paste.leonerd.org.uk/?show=1135 [18:28] erm, eek [18:28] * maxb reads in detail [18:28] we don't support python 2.3 [18:28] OK... So... Why's it trying to run it? [18:28] I guess we don't have that declared in debian/control [18:28] Anything I can do to fix it? [18:28] Why on earth do you even have python 2.1, 2.2, 2.3 installed on a squeeze machine? :-) [18:28] No idea [18:29] Probably never removed them [18:29] uninstall python2.3 ? [18:29] OK.. [18:29] I'll fix the package to add >= 2.4 [18:30] Riiiighty... Having done that, it's now running nicely smooth.. thanks. [18:31] LeoNerd: :-) ... and Wednesday? [18:31] Probably busy then also... [18:31] k [18:31] Don't worry this week [18:32] Hah... ENOSPC [18:32] guess I'd better grow my home then.. :/ [18:35] GaryvdM: I've got a pending update for BzrExplorer that populates %%selected in tool definitions with what is selected in the working tree browser. How do you completely cancel a selection in the qbzr working tree browser? [18:36] Um.. [18:41] I'm sure it's fine to just do treewidget.selectionModel().clear() -http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/qitemselectionmodel.html#clear [18:41] GaryvdM: Ah but how does the user do it? [18:42] Oh [18:42] * GaryvdM goes to look at the mp [18:45] SimonK: If you have 1 item selected, and you ctrl+click on it, then you have no selection. [18:47] SimonK: then you need to use the context menu key on your keyboard, cause when you right click, you get a selected item. [18:50] GaryvdM: Thanks [18:52] GaryvdM: While on the subject, should I update it to support %selected in 'shell' tools? [18:54] SimonK: I'm not sure what that is. I've never used the tools utility in bzr-exporer. If it would be usefull to you, then yes I guess. [18:55] GaryvdM: It's not particularly useful - I just thought it would be more consistent [20:22] you know what would be great? if there were a url shortcut which expanded to my username... [20:22] so that instead of doing bzr push lp:~my-long-ass-username/drizzle/branchname, I could do: bzr push lp:~/drizzle/branchname or something [20:27] mtaylor: I think jam recently fixed that for lp. [20:27] mtaylor: It previously work for other urls, e.g. sftp://server/~/mybranch [20:32] GaryvdM: wow. I llove it when I request something and it just happens :) [20:34] hello [20:39] Hi poolie [20:40] mtaylor: I just checked, it was added in 2.3b1 [20:40] GaryvdM: excellent. I'm excited to use that when 2.3 lands! [20:43] hi monty [20:48] jam, hi? [20:49] mtaylor: i think you only need 2.3b1 (or now b2?) on the client to use it [20:49] so you're waiting for that in... maverick-updates? [20:50] No, maverick is in 2.2.x [20:51] s/in/on/ [20:54] oh of course [20:54] so you'd need to use the ppa, or wait for natty [20:54] it's early :) [20:59] GaryvdM: i think it's quite likely that fixing 483388 would fix 588698 [20:59] which i guess is the real test for whether they are a dupe [21:04] and of course it has a good simple reproduction case [21:07] hullo? [21:08] Shhh. I'm hunting wabbits. [21:08] exit [21:09] poolie: I agree (sorry - did not think it was a question.) [21:09] i am the ruler of the worlds [21:09] anyhow, if you want to talk about it more, i'll be around, otherwise just go for it [21:09] Ok [21:13] hi poolie [21:16] hi there, shall we have a talk? [21:16] poolie: sure [21:17] skype or pots? [21:18] poolie: skype is easy [21:44] Hi. I have a local branch that I want to now merge onto an lp branch. BOth are the same up to revision 23 [21:44] however, the public branch has a revision 24, while the local branch has 24-30 [21:45] I am trying to merge all of 24-30 onto 23, but keep the separate commits [21:45] I started by doing merge -r 24 my/local/branch [21:45] that applies revision 24 of the local branch [21:45] when I do commit, it says that I have a pending merge, the same as the one I just tried to merge [21:46] homeasvs: you shouldn't have to specify the revision at all [21:46] is that normal? How can I commit exactly revision 24 of the local branch onto my public checkout, keeping the commit message? [21:46]