| fdv | Jc2k: thanks a lot for your help, you put me on the right track. turns out "use of a system shared libexpat.so/expat.dll is not advised" in python. No wonder I couldn't get the tests to pass. :p | 00:21 |
|---|---|---|
| === Spaz is now known as _ | ||
| === _ is now known as Spaz | ||
| Jc2k | :p | 00:37 |
| Jc2k | np fdv | 00:37 |
| === fta_ is now known as fta | ||
| === jszakmeister is now known as jszakmeister|awa | ||
| === mark1 is now known as markh | ||
| === snaggen1 is now known as Snaggen | ||
| === Mario__ is now known as pygi | ||
| === asac_ is now known as asac | ||
| Glenjamin | hey, does anyone else have a problem with directory tab completion on windows with 1.10? | 11:35 |
| Glenjamin | (as in, it doesnt happen) | 11:36 |
| markh | Glenjamin: what do you mean exactly? tab completion is generally handled by the "shell" (ie, the command-prompt) | 11:37 |
| Glenjamin | oh, in bzr shell | 11:37 |
| Glenjamin | should have mentioned that | 11:37 |
| markh | I've never used it (and don't even know *what* it is :) - did it ever work, or this is just something you first tried now? | 11:38 |
| Glenjamin | its always worked fine, but now the tab completion only seems to do commands | 11:39 |
| markh | either way though, I'm afraid I'm not going to have a clue | 11:39 |
| Glenjamin | fair enough | 11:39 |
| markh | if it is a regression, it is certainly worth reporting in as much detail as you can | 11:39 |
| markh | (ie, to launchpad) | 11:39 |
| Glenjamin | mm, i thought i'd better try and see if its affecting anyone else, since i'm not using the proper win32 release | 11:40 |
| Glenjamin | as i built my own while the build machine was broken | 11:40 |
| doublep | hello. is it possible to change commiter of a revision? i forgot to set my email and a few commits are attributed to a wrong user | 16:17 |
| moquist | I added a local copy of a huge library to my branch and committed it, and now I've changed my mind. 'bzr revert' seems only to change my working tree; how can I revert the entire branch so it's as if those files were never added and the branch committed? | 16:34 |
| fullermd | You have to back the branch up to before all that happened. | 16:34 |
| fullermd | Generally, you do that with either pull or uncommit. | 16:35 |
| fullermd | Is this really recent (in branch history terms)? | 16:35 |
| moquist | ah! uncommit - excellent. I hadn't yet found that in my meanderings through the help. Thx. | 16:35 |
| moquist | fullermd: yes. This will be no problem. | 16:36 |
| moquist | thx again. | 16:36 |
| fullermd | Note that 'uncommit' takes you back to the state right before you committed. | 16:36 |
| fullermd | Which means that the library is still "add"'d. So if you commit again right away, you'll be right back where you started ;) | 16:37 |
| moquist | right, so the files will still be there. | 16:37 |
| * moquist nods | 16:37 | |
| fullermd | You could revert the tree, though that would lose any other changes you had since the last commit. Or use 'rm --keep' to un-add the library. | 16:37 |
| moquist | I'll uncommit to one rev before what I want, then I can recommit that and manually merge in the tiny number of changes I've made to files I actually want to keep. | 16:38 |
| fullermd | Another option is to make a new branch, from the rev before the one you want. | 16:38 |
| fullermd | Then manually cherrypick the changes from the 'original' branch over into the new one, and finally just mv them around so you move onward in the 'new' branch. | 16:39 |
| fullermd | That way you can keep the old one around untouched, just in case. | 16:39 |
| moquist | That seems like the best idea. | 16:39 |
| moquist | beautiful. I'm almost done. | 16:40 |
| rocky | what's the simplest workflow case of having non-committed changes in one branch and then wanting to move those changes over into another new branch without committing them to the current one and then removing those changes from the currnet branch? | 16:49 |
| rocky | i would have thought bzr shelve in the first branch and the bzr unshelve in the second branch but that doesn't seem to work | 16:49 |
| rocky | bzr 1.10 | 16:50 |
| Peng_ | rocky: "bzr merge --uncommitted"? | 16:50 |
| rocky | Peng_: perfect, thanks :) | 16:51 |
| Peng_ | :) | 16:52 |
| epsy | hi, is bzr-svn compatible with bzr 1.10 ? | 18:05 |
| epsy | ok, I'm officially stupid, nevermind | 18:10 |
| epsy | my second question - do you know of any tool which can help me find the latest common ancestor of two branches when they are not linked from bzr's point of view? | 18:12 |
| LarstiQ | epsy: you're using a different definition of common ancestor than bzr in that case? | 18:13 |
| epsy | well, the last revision that's common in two branches | 18:16 |
| LarstiQ | epsy: if needed once, I'd figure that out from `bzr missing` output | 18:19 |
| epsy | neat..can I check if a branch has diverged from an official branch using bzr missing? or is another command better-suited for this task, considering I would use it in a shell script? | 18:21 |
| LarstiQ | epsy: bzr missing is a good choice for detecting divergence | 18:34 |
| epsy | only if tree is not a checkout, right? | 18:35 |
| LarstiQ | epsy: what do you mean? missing operates on branches, not trees | 18:38 |
| epsy | well, actually, I will just need a way to dertermine the other branch properly | 18:39 |
| derekmounce_ | Silly question no doubt, but I'm coming from SVN... Does Bazaar support access control? I want to push a branch up to a server, but I want only people with access to get to it. | 19:31 |
| beuno | derekmounce_, access control is based on who can read/write | 19:35 |
| beuno | so you'd setup ssh accounts or ftp | 19:35 |
| derekmounce_ | beuno: Ok, cool, so it's not "built in" to bzr. That makes sense... | 19:35 |
| derekmounce_ | Thanks for the answer. :) | 19:36 |
| beuno | right, although there is a script in controb/ that helps you do some of that with ssh keys | 19:36 |
| derekmounce_ | Another question... I've pushed via ftp, but I'd also like to have a working tree up in FTP. Is it possible to force the push to also create a working tree? | 20:05 |
| === _thumper_ is now known as thumper | ||
| === Mario__ is now known as pygi | ||
| lamalex | is there any way to have --using meld open the entire diff instead of files by file? | 21:44 |
| brokencycle | Hi! I've got a number of random error messages from running the selftest suite. Where should I send them, for best results? | 22:04 |
| rockstar | beuno, around? | 22:34 |
| lamalex | Does the bzr support in meld work for anyone? | 23:06 |
| beuno | rockstar, hi | 23:24 |
| rockstar | beuno, have you seen the loggerhead branch for better linking of files? | 23:25 |
| beuno | rockstar, I don't think so. Which one? | 23:26 |
| rockstar | lp:~ree/loggerhead/abstract-paths-fix | 23:26 |
| beuno | looks interesting | 23:29 |
| rockstar | Basically, I wondered if there was a policy on XXX statements in Loggerhead, but basically, I don't think it needs to be there at all. | 23:29 |
| beuno | yeah, it's kinda odd | 23:30 |
| beuno | I do add FIXME's now and then, which I guess is the same thing | 23:30 |
| beuno | the comment is useful though | 23:32 |
| beuno | branch looks good otherwise | 23:32 |
| beuno | are you reviewing it? :) | 23:32 |
| rockstar | beuno, yup. | 23:35 |
| beuno | rockstar, awesome | 23:35 |
| beuno | I have a branch 80% ready that uses YUI to get diffs through ajax | 23:36 |
| beuno | instead of generating them every time | 23:36 |
| === Mario__ is now known as pygi | ||
| Peng_ | What does this change for users with JS disabled? | 23:37 |
| beuno | Peng_, the URL will take you to a diff | 23:38 |
| beuno | so you loose seeing all diffs in the same page I suppose | 23:38 |
| beuno | is that terrible? | 23:38 |
| rockstar | beuno, aren't we using javascript for that as it is? | 23:39 |
| beuno | rockstar, yeah, for expanding and contracting | 23:39 |
| Peng_ | beuno: Ehh, it's not great. What about taking you to an ?diffs=all#somefile page or something? | 23:39 |
| beuno | Peng_, I guess I could... | 23:40 |
| rockstar | Peng_, it's not great, no, but for those who don't want javascript, they are already experiencing a less than great internets. | 23:40 |
| Peng_ | rockstar: Well yeah, but.. | 23:41 |
| beuno | Peng_, especially since you're our testsuite ;) | 23:41 |
| rockstar | beuno, We _can_ remedy that. | 23:41 |
| Peng_ | Whenever I use a diff page in Trac or something, I like to see all the files at once, but I don't do it frequently. | 23:42 |
| Peng_ | I more use them to see "what happened there?" than to actually debug stuff or anything like that.. | 23:42 |
| Peng_ | Or maybe that is the normal usage. After all, if you wanted to do something more in-depth, that's what the VCS is for. | 23:42 |
| beuno | rockstar, yeah, we do need to start writing tests... | 23:43 |
| beuno | Peng_, I'll have the option to see all the diffs for a revision | 23:43 |
| beuno | it's not too hard | 23:43 |
| Peng_ | Oh, that sounds good. | 23:43 |
| Peng_ | For both Ajax and non-Ajax? Or would that not be very useful? | 23:44 |
| rockstar | beuno, I say non-Ajax tests. | 23:44 |
| beuno | Peng_, I think that the link will be there when avascript is disabled | 23:45 |
| beuno | rockstar, yeah, so did I | 23:45 |
| Peng_ | Wait, what page is this for? /revision? | 23:46 |
| beuno | Peng_, yup | 23:48 |
| Peng_ | So it'll default to having every file collapsed? | 23:49 |
| beuno | that's my idea, yes | 23:49 |
| Peng_ | Will you keep the "expand all/collapse all" button? | 23:50 |
| beuno | yeap | 23:50 |
| beuno | it will bring in all the diffs | 23:50 |
| Peng_ | Cool. :) | 23:51 |
| Peng_ | Possible suggestion: If only one file was changed, expand it by default? | 23:51 |
| beuno | that would be interesting, yes | 23:51 |
| beuno | although maybe confusing | 23:52 |
| beuno | sometimes ahving diffs, sometimes not | 23:52 |
| Peng_ | True. | 23:53 |
| beuno | Peng_, I'll poke you before merging into trunk | 23:55 |
| Peng_ | 'kay | 23:55 |
| beuno | I also experimented with adding syntax highlighting, but it's a PITA to do with the way we currently do things | 23:58 |
| Peng_ | Oh, too bad. | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!