| jelmer | mwhudson: current bzr-git doesn't have a problem with that branch | 00:27 |
|---|---|---|
| mwhudson | jelmer: cool | 00:29 |
| === Kissaki is now known as Kissaki^0ff | ||
| mwhudson | jelmer: have you released bzr-git yet? | 00:55 |
| jelmer | mwhudson: yeah, 0.4.0 | 00:59 |
| mwhudson | does that have all the relevant fixes in? | 01:05 |
| jelmer | yeah | 01:05 |
| mwhudson | cool | 01:05 |
| abentley | spiv: around? | 01:53 |
| spiv | abentley: not really... | 02:13 |
| jrwren | can I ask bzr ls for find -ls style output? | 03:00 |
| AfC | jrwren: | 03:13 |
| AfC | $ bzr ls -R | ls -ld | 03:13 |
| johnf | LarstiQ: do you have time to package latest version of bzr-svn? | 04:01 |
| === mthaddon is now known as afk | ||
| mwhudson | johnf: will 1.16 be in the ~bzr ppa soon? | 07:16 |
| johnf | mwhudson: need to wait on bzr-svn before I can copy it across. I'll make a start on it later on tonight if I don't hear frm LarstiQ. It's in ~bzr-beta-ppa now if you're keen | 07:29 |
| mwhudson | johnf: ah, cool | 07:30 |
| === Kissaki^0ff is now known as Kissaki | ||
| hsn_ | i am using python based windows install. If i run bzr info, python complains about missing zlib1.dll | 09:45 |
| Peng_ | Oogh. What version? | 09:45 |
| hsn_ | 1.16 | 09:46 |
| Peng_ | There have been problems (and changes) with zlib on Windows. I dunno anything, though. | 09:48 |
| hsn_ | it probably needs to be added to list of libraries needed to run bzr | 09:49 |
| Peng_ | zlib is a little complicated. | 09:50 |
| hsn_ | but why you are not using zlib python module? it works | 09:50 |
| Peng_ | Or, yeah, the installer might just be missing it completely or something. | 09:50 |
| Peng_ | hsn_: This is from C, not Python. | 09:51 |
| Peng_ | hsn_: They investigated using Python's copy of zlib, but it's not possible. | 09:51 |
| lifeless | hsn_: we do use the python zlib module; the C groupcompress extension however is much faster by using zlib directly from C | 09:54 |
| lifeless | hsn_: so you need to install zlib1.dll from the zlib site :) | 09:55 |
| hsn_ | it can not be added to installer? | 09:56 |
| lifeless | it is I think; you're using the python install method though | 09:56 |
| lifeless | and python statically links zlib | 09:56 |
| lifeless | or something like that | 09:56 |
| Peng_ | Oh, you need to install zlib yourself now? | 09:57 |
| hsn_ | i will update wiki then | 09:57 |
| hsn_ | it seems to work without zlib just fine, except you must press 'enter' on every popup message box | 09:58 |
| Peng_ | C zlib is only used if you're using the development6-rich-root or 2a repo formats, so you probably won't actually run into it. | 10:01 |
| hsn_ | oh man, you updated wiki, it have different syntax now | 10:06 |
| lifeless | hsn_: its still moin | 10:10 |
| lifeless | hsn_: just uses ReST rather than wiki-specific syntax | 10:10 |
| hsn_ | ReST is probably worst markup language ever made | 10:22 |
| Peng_ | Is there a LOLMARKUP? | 10:23 |
| lifeless | Peng_: you could make one, based on intercal? | 10:23 |
| Peng_ | Heh, nice. | 10:24 |
| hsn_ | how to write backslash in ReST? | 10:35 |
| lifeless | \ ? | 10:35 |
| hsn_ | '\?' doesnt work | 10:36 |
| hsn_ | it renders to '?' | 10:37 |
| lifeless | try \\ | 10:37 |
| lifeless | if you're writing a path, you might want ``c:\\foo\\bar`` | 10:37 |
| hsn_ | done. | 10:39 |
| lifeless | hsn_: is 1.16 working better for you now? | 10:46 |
| garyvdm | Hi lifeless | 10:47 |
| lifeless | hi garyvdm | 10:47 |
| garyvdm | lifeless: Tree._comparison_data - How come it is _private? | 10:47 |
| lifeless | its not meant to be called by code outside the implementation of Tree | 10:48 |
| hsn_ | lifeless: no, but at least it doesnt complains about missing zlib1.dll | 10:48 |
| garyvdm | lifeless: It would be nice if there was a Tree.is_executable(path) method. | 10:49 |
| lifeless | garyvdm: you can of course, but its not fixed as an api and we're allowed to change it as desired | 10:49 |
| lifeless | garyvdm: you could make one | 10:50 |
| garyvdm | ok | 10:51 |
| lifeless | note that it may be faster to call iter_changes() and use the tree.basis_tree() to get data | 10:53 |
| lifeless | iter_changes is _the_ optimised code path for getting data from the tree | 10:54 |
| garyvdm | lifeless: I'm making my control walk through a unversioned directory | 11:00 |
| garyvdm | I don't know how to get iter_changes to do that. | 11:00 |
| lifeless | oh, it won't | 11:01 |
| lifeless | for that you'd need walkdirs | 11:01 |
| lifeless | which is a component of iter_changes, and also highly optimised | 11:01 |
| hsn_ | http://pastebin.ca/1467426 - it seems that some windows related issues are still not fixed in 1.16. Last working version for me is 1.9 | 11:01 |
| lifeless | it has enough data to answer 'executable', at least on linux | 11:01 |
| lifeless | hsn_: there is a guy working on the exception printing stuff | 11:02 |
| lifeless | he was discussing it on the list yesterday | 11:02 |
| aboSamoor | Hi, I am using launchpad with bzr and I had problem to understand the version numbers. For example, I have this version number 65.1.3 ? What does it mean ? | 12:18 |
| lifeless | it means that that revision is the third revision on a branch made from rev 65 | 12:22 |
| aboSamoor | lifeless: I am using my laptop and desktop to commit changes to my branch, I get confused with merge and branches, what do you suggest the best practice/workflow to follow ? | 12:26 |
| lifeless | what is confusing | 12:27 |
| aboSamoor | lifeless: I am new to the idea of control version systems | 12:27 |
| lifeless | simple workflow then is: | 12:28 |
| lifeless | at site A) work work work, commit, push | 12:28 |
| lifeless | at site B) 'bzr pull'. work work work, commit, push | 12:28 |
| lifeless | as its just you, you can't be in two places at once, so you have no need to be merging. | 12:29 |
| lifeless | going back to A), 'bzr pull', work work work, commit, push | 12:29 |
| lifeless | rinse and repeat | 12:29 |
| aboSamoor | at site B I usually do bzr update, what if I have local changes on B that they are not commited yet, do bzr pull overwrite them ? | 12:30 |
| lifeless | pull won't overwrite | 12:32 |
| lifeless | it merges in | 12:32 |
| aboSamoor | lifeless: perfect :) | 12:32 |
| lifeless | update won't do much unless you made your local workspace by doing 'bzr checkout' | 12:32 |
| lifeless | if you did, then you should use update rather than pull, and not run 'push' | 12:32 |
| aboSamoor | lifeless: usually I start my workspace by bzr branch | 12:35 |
| lifeless | then my first answer was appropriat | 12:36 |
| aboSamoor | lifeless: what is the difference between branch and checkout ? | 12:37 |
| lifeless | branch mamkes a new branch, checkout only lets you edit an existing branch | 12:37 |
| Nafallo | so. when will 1.16 be available in the PPAs? :-) | 13:13 |
| Nafallo | even the nightly's seem to have 1.15 right now. | 13:14 |
| mwhudson | Nafallo: 1.16 is in the ~bzr-beta-ppa | 13:15 |
| mwhudson | apparently, the bzr ppa is waiting on a 1.16 compatible packaging of bzr-svn | 13:15 |
| Nafallo | ah. so it isn't then... | 13:16 |
| glyph | Hello... people | 13:16 |
| glyph | what's the name for bzr users anyway | 13:16 |
| glyph | bizarros? | 13:16 |
| glyph | So, I've noticed a periodic problem as I've been introducing people to bzr and launchpad | 13:16 |
| Nafallo | oh. never mind me. | 13:16 |
| Nafallo | 9 hours ago... :-) | 13:17 |
| glyph | inevitably, the first couple of checkins they do will end up having the wrong 'id', they'll forget to do 'bzr whoami' until it shows up on an lp page and doesn't link to their profile | 13:17 |
| Nafallo | mwhudson: thanks | 13:17 |
| glyph | non-bzr users tend to get it wrong for longer | 13:17 |
| glyph | erm | 13:17 |
| glyph | non-lp bzr users get it wrong for longer, I mean | 13:17 |
| glyph | Is it reasonable to fix your user-ID in old revisions? | 13:17 |
| glyph | if so, how do you do it? | 13:18 |
| mwhudson | sadly no, not really | 13:18 |
| lifeless | if they haven't been pushed, its reasonable | 13:18 |
| lifeless | fast-export, uncommit, fast-import | 13:18 |
| glyph | lifeless: yeah, but what if they have been pushed? :) | 13:19 |
| lifeless | if they've been pushed then other people may already be depending on their revisions | 13:19 |
| glyph | it would be really neat | 13:19 |
| glyph | to have revisions which were updates to other revisions :) | 13:19 |
| lifeless | you can do that | 13:20 |
| glyph | so you could have very explicit "im in ur revision graph, fixin ur changelogs" | 13:20 |
| lifeless | branch from the first rev | 13:20 |
| lifeless | commit a no-text change new commit message | 13:20 |
| lifeless | merge the second commit, and whenc ommitting do the same thing | 13:20 |
| lifeless | etc | 13:20 |
| glyph | lifeless: dang | 13:21 |
| glyph | lifeless: If anybody has conflicts, isn't that going to be a terrifying mess to resolve? | 13:21 |
| lifeless | no, why would it be? | 13:21 |
| * glyph thinks | 13:21 | |
| glyph | I guess it wouldn't, at that. | 13:21 |
| glyph | lifeless: how does one branch from a particular revision? | 13:21 |
| lifeless | branch -r revspec | 13:22 |
| glyph | oh, of course. | 13:22 |
| glyph | if you can diff -r why wouldn't you be able to branch -r | 13:22 |
| === mario_ is now known as pygi | ||
| Adys | hi all. I need to include the bzr version in one of my pages in my project. All I can find is this extension: https://code.launchpad.net/~ian-clatworthy/bzr-keywords/trunk | 16:16 |
| Adys | and its kinda out of date and undocumented. any better solution? | 16:16 |
| === `6og is now known as kgoetz | ||
| ddaa | the latest branch format advertises support for content modification (that is, newline conversion and keyword substitution) | 16:56 |
| ddaa | oops, he's gone | 16:56 |
| RenatoSilva | Is there any shortcut for http transport? | 22:09 |
| RenatoSilva | a shortcut for http://bazaar.launchpad.net I mean | 22:09 |
| beuno | RenatoSilva, lp:... | 22:20 |
| RenatoSilva | that's for bzr+ssh | 22:20 |
| Peng_ | It uses http if you're not logged in. | 22:21 |
| Peng_ | ...Why do you want http, anyway? | 22:21 |
| RenatoSilva | but there's no bzr logout yet :) | 22:21 |
| RenatoSilva | Peng_: for not having to open pageant | 22:22 |
| RenatoSilva | Peng_: for branching, pulling etc | 22:22 |
| RenatoSilva | Does Loggerhead have permalinks? | 23:27 |
| RenatoSilva | sorry, this is for #launchpad | 23:27 |
| lifeless | RenatoSilva: bzr+ssh is faster than http for branching and pulling | 23:44 |
| Peng_ | lifeless: Perhaps not if pageant is really slow. | 23:47 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!