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