[00:01] jelmer: thats what I was fearing would be the case... it seemed like a very complex solution to solve! [00:02] jelmer: do you have a goal timeframe in mind (e.g., days/weeks/months/years?) [00:03] jelmer: i'd be interested in your review of https://code.edge.launchpad.net/~mbp/bzr/deprecation/+merge/38647 if you get a chance [00:04] jelmer: i'm interested primarily to see which direction "the majority" of our devs end up going. A battle-hardened few find the "new" way of working more straightforward and easier than svn branches still, but a lot of the devs are a little on the fence not being so comfortable away from the tortiseXXX guis [00:06] spiv will be away sick today, in case anyone was hoping to talk to him [00:08] peitschie: It really depends on how we decide to fix it. My guess it will be weeks at least. [00:08] poolie: Sure, I'll have a look. [00:09] tell me if you think it's actually cleaner [00:11] jelmer: ok. it is understandable :). we'll limp along and keep waiting then! [00:30] hmm, I think I might also have fixed the hdb_asn1.h issue [00:30] * jelmer gets bit by his middle mouse button again [00:33] will the universe hate me if I change the duplicates of some AttributeError bugs are for the third time... [00:33] +grammar [00:34] in my defense, this was very confusing. [00:35] mgz: I think we'll be ok :-) [00:54] poolie: I've followed up to your MP. [00:56] wait, am I even more of a total idiot? [00:56] yes [00:56] poolie's mp is exactly the same thing? [00:56] no, wait, whats the question [00:56] but done properly? [00:57] * mgz branches it too see if it incidentally fixes the same bug [00:59] didn't even register it was about smart_add as well, thought it'd just be... deprecating some things [01:00] phew. still fails. my change may not merge now, but at least it wasn't completely pointless. [01:02] bed before I get myself in any more of a tizz. [01:07] mgz, seriously? [01:07] mgz, it was part of a saga towards fixing all the add bugs (and introducing shiny new ones :-) but it doesn't specifically fix anything [01:07] except by pure luck [01:07] thanks jelmer [01:16] I'm using bzr+ssh, and am attempting to use it on windows. Only, the ssh server uses public key authentication. How can I get bzr to recognize a public key to login to the server with? === adamdv is now known as AdamDV [01:37] AdamDV: see http://wiki.bazaar.canonical.com/Bzr_and_SSH [01:39] and if that's incomplete/unclear, please ask [01:39] Nope, makes sense. [01:40] bzr always amazes me at the simplicity :) [01:40] we should move/copy that to the user manual [01:40] :) [01:44] You should :) [02:11] AdamDV: bug 662448 [02:11] Launchpad bug 662448 in Bazaar "docs should describe how to set up ssh keys (affected: 1, heat: 6)" [Medium,Confirmed] https://launchpad.net/bugs/662448 [02:11] you could do it if you want :) [02:12] How do I edit the docs? [02:12] there's a document about that too :) ... [02:12] http://doc.bazaar.canonical.com/bzr.dev/developers/contribution-quickstart.html [02:12] and http://wiki.bazaar.canonical.com/ContributingToTheDocs [02:13] Will do :) [02:13] the best documenters are those who've just worked out how to do the thing they're describing [02:13] they're not so prone to assuming things are obvious [02:14] Mhm :) [02:15] So, let me get this straight [02:16] I have to use bzr to checkout the bzr documentation? [02:16] and fix it, and then recommit the bzr doc with bzr? [02:16] Irony.. [02:20] poolie: Okay, so how do I start? I have never used launchpad before :P [02:21] hm, so you need an account? [02:21] https://help.launchpad.net/YourAccount/NewAccount [02:22] REgistered [02:22] And I've assigned it to me [02:22] ok so [02:22] bzr init-repo ~/bzr [02:22] (I've used launchpad before, never actually helped with anythnig) [02:22] oh ok [02:22] alright, ran that [02:22] actually the quickstart guide should tell you how to make a branch... [02:24] reading.. [02:31] Lotsa code to check out.. [02:37] poolie: Shall I put this new documentation in user-guide? [02:43] that'd be good [02:45] Hi! I have trouble using bzr windows stand-alone binary on ssh inplemention... bzr keeps looking for /home/%CURRENTUSER%/.bzr directory, which is useless in Windows [02:46] I need bzr to look after %DOCUMENTROOT%\%CURRENTUSER%\.ssh [02:47] Perhaps there is some messing on ssh? I have putty with pegeant, my non-ssh branch works okay [02:48] MeaCulpa: it's looking for the ssh key in .bzR? [02:48] .bzr [02:48] adam was just updating the docs about that [02:48] I've been using bzr for years, but only the python version, My desktop have py2.7 now so I wanna try bzr standalone [02:49] I guess pure python ssh is long-time okay [02:49] poolie: it is looking on .ssh under /home/user thing, tis unix style [02:50] oh, i see [02:50] that is odd [02:51] maybe it is because my windows is messed up with opensource tools... :( [02:51] we're using os.path.expanduser [02:52] poolie: then this shall not be a problem... strange [02:52] MeaCulpa: what are %HOME% and %USERPROFILE% set to? [02:52] maybe the unix tools changed them [02:52] userprofile is set under documentroot/user [02:52] and I don't have %HOME% [02:53] maybe... there are many cygwin hacks hidden somewhere in my tools [02:53] * MeaCulpa hate cygwin [02:56] poolie: Should I use rest format when writing doc? [02:56] Or can I just format it as a txt file? [02:56] adamdv: ideally, rest [02:57] but plain txt is pretty close [02:57] Alright. [02:57] I can use rest, I think. [02:57] we can fix any markup bugs [02:57] Its going to be alot like the web equivelent, but I'll throw in a few tidbits from my personal bzr+ssh experience :P [03:17] poolie: hand-tuned bzr from source proved to be well-isolated and safely pythonic in my windows box, thank you for your concern! [03:19] poolie: Alright, I checked out, locally copied, added the file and wrote it, locally committed, and now am attempting to 'bzr push' [03:20] I get: bzr: ERROR: Not a branch: "/home/adam/bzr/.bzr/branch/": location is a repository. [03:22] what command? [03:24] bzr push [03:25] adamdv: i think you need to cd into the branch directory [03:25] and probably also specify a location on lp to push ot [03:26] according to the quickContribGuide, bzr push will work [03:26] like 'bzr push lp:~adamdv/bzr/662448-ssh-docs' [03:27] :| [03:27] Gotta register my ssh keys [03:29] pushing.. [03:29] Done. So, uhh, now what? [03:32] I'm guessing my change has to be approved? === adamdv is now known as AdamDV [03:52] AdamDV: normally you'd click then 'propose for merging' or type 'lp propose-merge' [03:52] Clicking. [03:53] Merge proposed :) [03:54] https://code.launchpad.net/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682 (I believe thats the link?) [04:04] * poolie looks [04:11] * adamdv crosses fingers [04:14] i'm reading it now [04:15] k [04:16] ok, replied [04:16] let's see what maritza says too [04:22] Internet sucks at my house :/ [04:34] poolie: I'm going to fix it, and probably make it more easily readable as well. [04:34] thanks [05:17] lol, bzr-stats's --show-class argument sure makes bzr stats have an appetite for memory, lol; its at over 1.5G and isn't even done with the first contributor yet [07:30] hi all ! [07:31] hi vila :) [09:42] hi there vila [09:42] poolie: hey ! [09:42] cody-somerville: ouch; on what tree? [10:01] moinmoin [10:01] jelmer: \o_ [10:20] poolie: you're at UDS with jam next week right ? [10:20] correct [10:21] poolie: so maybe one of you should switch with spiv as PP this week ? [10:22] thumper: The problem with the mesa branch appears to be caused by the fact that it's still in the 1.9 format rather than 2a. [10:38] jelmer_: I had the 1.9 one blown away though [10:38] jelmer_: the one that is importing is 2a [10:38] at least I thought as much [10:39] I'll get spm to check tomorrow [10:39] thumper: The web page claims it's 1.9 [10:39] jelmer_: that is because the branch won't get mirrored until it is fully imported [10:39] * thumper afk [10:39] thumper: ah, ok :-( [10:40] good idea; maybe i will because spiv was sick today [10:40] on phone [10:58] mgz: could you send an mp with your hack_transport branch cleaned if needed (but really if needed) waiting for the hook one to get fully discussed ? [10:59] mgz: it's a shame to still get leak related failures and block the osx slave when we fully understand the cause and have a available fix even if it's not perfect [10:59] mgz: *AND* a better one worked on... [11:09] hello, sorry for my english, how can i export only diff files between two revision? [11:10] hi there, just installed bzr on 8.04 from https://launchpad.net/~bzr/+archive/ppa .. but I got bzr 2.2 .. shouldn't it be 2.1? [11:12] ibxth: bzr diff -r x..y [11:13] fax8: No - 2.2 is now the stable release [11:15] GaryvdM, it give me a difference between revision. i need the files that have changed [11:16] ibxth: bzr status -r x..y [11:16] ibxth then bzr cat FILE -r y [11:18] but i need ALL the files than have changed between two revision [11:20] ibxth: What are you going to do with the files? [11:21] Upload to server. [11:22] ibxth: Do you know that the bzr-upload plugin does this for you [11:23] GaryvdM, thanks [11:24] I did not know about this plugin [11:25] GaryvdM: thanks, than this has to be updated http://wiki.bazaar.canonical.com/DistroDownloads#Ubuntu [11:25] fax8: ok [11:27] GaryvdM: saw the page updated, thanks! [11:32] GaryvdM: I would say that the two lines: [11:32] Stable version: 2.2.1 [11:32] Test version: 2.3b1 [11:33] under the bazaar logo on the bazaar website homepage need more visibility.. I spent the some time trying to find what was the latest stable version [11:33] fax8: That would mean that we would have to update that page a lot more often [11:34] Could these things be pulled from a central source somewhere? [11:35] I see the 2.2.1, and 2.3b2 announced on http://bazaar.canonical.com/en/ [11:35] under the Core News heading. [11:42] nope. I mean this http://img26.imageshack.us/img26/8591/bzrhomepage.jpg [11:43] fax8: Oh - I understand now. I don [11:44] I don't know who would be able to fix that. poolie? [11:50] GaryvdM: should be in bzr-website === Ursinha-afk is now known as Ursinha === jelmer_ is now known as jelmer === arjenAU2 is now known as arjenAU [13:47] hi [13:47] can someone answer a question? [13:48] Kaamos: Depends on the question. :-) [13:48] Kaamos: Just ask the question, if there's somebody around who knows the answer or can help they'll speak up. [13:48] =), i want to know how the bazaar keeps track of the changes made to the files [13:49] Kaamos: how does it store the deltas between in the repository you mean? [13:50] im not quite familiar with those tools, im writing a college paper about those SCM tools comparing to the caracterisitics of the ISO 140102 [13:50] and one of these caracterisitics is keep track of the changes [13:51] by the example, it means to know who changed the fyle, what change was made, and when it was made [14:02] Kaamos: I would recommend this as a good first read: http://www.ericsink.com/scm/scm_repositories.html [14:03] bzr is different in some details, but it will give you a good picture. [14:22] thank you gary i will look it right now === Ursinha is now known as Ursinha-afk [14:38] vila: will do. [14:38] mgz: great ! [14:40] mgz: by the way, shouldn't you land https://code.edge.launchpad.net/~gz/bzr/require_unicode_committer_614593/+merge/38334 ? [14:40] possibly. was wondering if jam would save me from my fretting with more sage advice. [14:41] mgz: k, request a review then, it's more likely to get you an answer for an mp already approved ;) [14:42] that might be wise. was just going to try and glomp him here. [14:52] okay, put a mp up with the hack vila, and sent a message to the list. === Ursinha-afk is now known as Ursinha === Ursinha is now known as Ursinha-lunch [16:03] how does bazaar handles the history of a file? [16:19] Gently? :) [16:23] =D [16:24] for what i see, it is using the diff command [16:24] but i dont know how it works [16:24] if he displays who have done the change [16:24] Kaamos: what do you want to do? maybe you want "bzr log" ? [16:25] yeah something like that [16:25] What was changed [16:25] When the change was made [16:25] Who did it [16:25] Why (the comment entered at checkin time) [16:25] that bzr log, yeah [16:26] bzr log provides all this informations? [16:27] yip; take a look at "bzr help log" [16:28] i will tkz guys [16:31] Kaamos: Also bzr annotate FILE === Ursinha-lunch is now known as Ursinha === beuno is now known as beuno-lunch [17:57] i've added 'missing' to 'bzr status' for bug 134168; i've updated BranchStatus.test_tree_status_specific_files -- what other tests should i change? [17:57] Launchpad bug 134168 in Bazaar "status does not show missing files that are newly added (affected: 0, heat: 3)" [Medium,Confirmed] https://launchpad.net/bugs/134168 [17:58] if all the tests pass, and whatever you added is tested by that - then in theory that should be enough. [17:59] ok. there's a whole mishmash of testing non-existent file cases [18:01] maxb: Will you have a chance to follow up on my comments to your subvertpy branch? === Meths_ is now known as Meths === beuno-lunch is now known as beuno [19:36] maxb: ping === frakturfreak_ is now known as frakturfreak [20:31] hi how to ignore a single collom of a file? [20:34] hello guys [20:34] what is a revision? is it a commit in the mainline? [20:36] it's a state of the source code tree [20:37] is it possible to calculate the revisio number just based on the commit tree? [20:38] it's a graph, not a tree [20:38] but yes, that's how bzr revision numbers are calculated [20:38] just going down the mainline and adding the commit?S [20:38] oh, but perhaps you meant a different tree [20:38] for the mainline yes [20:39] it get's complicated with merges [20:39] i'm using git and i want to calculate that pesky bzr revision number [20:39] hm? [20:40] i converted a bzr repo to a git repo [20:40] but even excluding the merges will generate revnumber which is toobig [20:40] to be true [20:42] well, I'm not sure what are you really asking [20:42] i want to know how the revision number is generated [20:42] http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/RevNumbering [20:42] omg [20:42] your google skills are better [20:43] then mine [20:43] thanks [20:43] I didn't have to google :) [20:43] yeah you used your ninja skillz [20:43] The author is a genius. Handsome, too. [20:44] what are you talking about? [20:44] Oh, just passing the time :) [20:44] and humble [20:45] If the either the author or you are not female please do it somehow different xD [20:45] I heard a rumor he once saved a bus full of school children from certain death in a volcano eruption. Might just be a rumor though. [20:46] who did that? [20:46] Superman? [20:47] Nah, Superman just saved some chick from an earthquake as I recall. He thinks so small... [20:48] hi how to ignore a single collom of a file? [20:57] fullermd: :-p [20:58] pinguin: what is a collom? column maybe? [20:58] yes [20:58] pinguin: Maybe content views may help. [20:59] pinguin: What type of file is it? [20:59] python [21:02] GaryvdM: have you a link to content views doku? [21:02] pinguin: Why? What column? (/me didnot know the python had columns) [21:03] pinguin: I'm trying to find what I was thinking about [21:04] Well, it's hard to do much python without using Coulombs... [21:04] i want to exclude a single line from a commit [21:05] pinguin: I was thinking about content filters ttp://doc.bazaar.canonical.com/latest/en/user-reference/content-filters-help.html [21:05] pinguin: But you probably just want to shelve + commit + unshelve [21:08] for example we have a password in our file and that should not be under version control [21:10] hmmm [21:12] Oh - The best thing is to probably extract it a config file that does not get versioned. [21:13] no we need the file under version control (only one line ignored) [21:24] fullermd: he thinks with his penis [21:24] :> [21:24] but even so he should have saved a bus full of cheerleaders [22:32] mornin all :) === Ursinha is now known as Ursinha-afk [23:01] "bzr launchpad-login foo" will tell bzr to set my launchpad username to "foo" [23:01] how can i unset it or set it to nothing? [23:05] you have to edit the config file as far as I know [23:06] which config file? [23:07] ~/.bazaar/bazaar.conf [23:07] mkanat, hi? [23:08] Hey poolie. :-) [23:15] mwhudson: thank you [23:33] evnin' [23:44] hi dOxxx