| jelmer | mwhudson: hey | 00:13 |
|---|---|---|
| jelmer | mwhudson: yep (-: | 00:13 |
| wgrant | Is there a way to invoke the 'bzr up' with local commits semantics without being bound? | 02:37 |
| wgrant | ie. pull trunk and merge your current branch into it, in the one branch. | 02:38 |
| Peng | I'm sure you could do something involving "bzr log -r -1 --show-ids", "bzr pull --overwrite" and "bzr merge . -r revid:...", but... | 02:43 |
| wgrant | Right, that's what it would have to do. | 02:44 |
| idnar | bzr rebase? | 02:44 |
| idnar | maybe not | 02:44 |
| james_w | wgrant: I often want the same thing, but haven't wanted it enough to write the plugin to do it yet | 02:44 |
| wgrant | It'd be a trivial plugin, but it would be nice to have it easily available for everyone. Since Git people tend to do the 'merge trunk into branch, push branch over trunk' thing, because AIUI git parents are unordered. | 02:46 |
| wgrant | And it would be nice to have a very similar bzr workflow which works unbound, and doesn't replace the mainline history. | 02:47 |
| NfNitLoop | wgrant: Yeah, I do that workflow, but I do it by always having a clean mirror of upstream handy to merge onto. | 03:11 |
| wgrant | So do I. | 03:12 |
| wgrant | But others don't like that requirement. | 03:12 |
| jelmer | wgrant: git parents are ordered | 03:24 |
| jelmer | wgrant: that'd be roughly equivalent to just bzr merge .../trunk && bzr ci -m "Merge trunk" && bzr push .../trunk, no? | 03:25 |
| wgrant | jelmer: But that changes the LHS history. | 03:31 |
| wgrant | If I bzr up on a bound branch, trunk's tip replaces mine, and my local commits show up as a pending merg.re | 03:32 |
| Kraln | So I have a crazy question. Why does a 150 line change cause more than 360mb of transfer? (repacking texts) | 03:40 |
| Kraln | (- 371561KB 114KB/s | Fetching revisions:Inserting stream:repacking texts:texts 6235/7200) | 03:40 |
| jelmer | wgrant: it also changes the LHS history in Git, except Git folks don't seem to care about LHS history.. | 03:44 |
| jelmer | Kraln: it would only take so much data every so often (bzr was repacking your repository apparnetly) | 03:44 |
| Kraln | this was a tiny commit! | 03:44 |
| Kraln | it's up to 400mb of transfer for 100 lines of changes, if that | 03:45 |
| wgrant | jelmer: Ah, I see. | 03:45 |
| jelmer | Kraln: Repacking happens every X commits or so | 03:46 |
| Kraln | can I disable that? this is a *large* repo | 03:46 |
| jelmer | Kraln: another 100line change right now won't require that much data to be transferred | 03:46 |
| jelmer | Kraln I think you can disable it but it'll slow down your repository access in the long run | 03:46 |
| Kraln | 400mb of transfer on a dsl line means it's been hours to make this commit | 03:47 |
| jelmer | Kraln: an alternative is to use the smart server rather than sftp, in which case the repacking will happen on the server side | 03:47 |
| Kraln | how do I set that up? | 03:47 |
| jelmer | use bzr+ssh rather than sftp | 03:47 |
| Kraln | that's it? | 03:47 |
| jelmer | Kraln: I think so | 03:47 |
| wgrant | As long as you have a recent bzr on the server. | 03:47 |
| Kraln | it's 2.1 or whatever | 03:47 |
| jelmer | wgrant: that said, I'm sure we'd welcome a patch to use the merge revision as the first parent rather than the previous local head | 03:47 |
| wgrant | jelmer: Oh, so we could just switch the parents at commit time? | 03:48 |
| jelmer | wgrant: yeah | 03:50 |
| wgrant | jelmer: True. That sounds much easier. | 03:50 |
| Kraln | http://dpb.pastebin.com/LaiDv5U1 | 03:51 |
| Kraln | :| | 03:53 |
| Kraln | hmm, the folder on the server is empty | 03:54 |
| Kraln | not feeling too peachy-keen happy with bzr at the moment | 03:55 |
| NfNitLoop | try pushing with just sftp? | 03:59 |
| mgiuca | Hello, | 04:12 |
| mgiuca | wgrant just sent me a recent chat snippet from here, about replacing the LHS history with bzr merge / push | 04:12 |
| mgiuca | Versus Git. | 04:12 |
| wgrant | Hi mgiuca. | 04:13 |
| mgiuca | "< jelmer> wgrant: it also changes the LHS history in Git, except Git folks don't seem to care about LHS history.." | 04:13 |
| mgiuca | I didn't know Git had LHS history at all. | 04:13 |
| mgiuca | Just thinking that in Bzr, if you have a local mirror of a branch, which has diverged, there's no simple way to 1. Merge, then 2. Push your changes up to the branch (eg on Launchpad) without reordering the LHS history on Launchpad. | 04:15 |
| mgiuca | Except if you were bound, you could do an update. | 04:15 |
| mgiuca | Maybe wgrant already discussed this before. | 04:16 |
| === gnomefreak76 is now known as gnomefreak | ||
| === ubuntujenkins_ is now known as ubuntujenkins | ||
| A4Tech | All greetings. A bit strange question: I can host on the local machine to deploy the system bzr only without web? | 14:37 |
| === tro|| is now known as tro | ||
| === lionel___ is now known as 5EXAAKZ44 | ||
| bendj | Hi. I'm trying to get my head around repos-in-repos ... Iiuc, I can pull an external branch into my local repo, e.g.: bzr init myrepo; bzr branch myrepo/extrepo. | 18:18 |
| bendj | Am i then supposed to 'ignore' the extrepo dir, managing it separately? | 18:18 |
| Kilroo | That sounds like it would work, but I've never done it. | 18:20 |
| Kilroo | Inside the extrepo directory it will find the extrepo/.bzr directory first and go by that, and outside that directory it's been told to ignore it so it doesn't care that it's there. | 18:21 |
| bendj | Kilroo: Ok, sounds reasonable. Now, can it be further extended to 'nest' another branch under /myrepo/extrepo/YArepo, and manage *it* from the top/parent, myrepo? I'm pretty sure I'm confused by this ;-) | 18:24 |
| bendj | Kilroo: More context might help ... what I'm trying to do it this -> https://lists.ubuntu.com/archives/bazaar/2010q1/067904.html | 18:24 |
| bendj | Has to do with, eventually, managing/staging Drupal sites ... | 18:24 |
| bendj | Kilroo: I suspect that I maybe approaching this wrong in the first place :-/ | 18:25 |
| Kilroo | Ah. | 18:25 |
| Kilroo | Step 1: avoid Drupal. | 18:25 |
| bendj | :-p | 18:25 |
| Kilroo | That's just my personal experience. | 18:25 |
| bendj | Kilroo: Actually, I'm using Pressflow ... that anybetter? | 18:25 |
| Kilroo | No idea. | 18:25 |
| bendj | Kilroo: Fair enough. Ignore that fact, then ....back to the bzr question :-) | 18:26 |
| Kilroo | right, reading | 18:26 |
| bendj | hehe ... | 18:26 |
| Kilroo | item the first: I think it's .bzrignore, you seem to have omitted the r | 18:26 |
| Kilroo | not sure I've ever ignored anything without doing it through bzreclipse though so I may be wrong | 18:27 |
| Kilroo | Ah. | 18:28 |
| bendj | Kilroo: sure, just a typo on my part for the post ... good catch | 18:28 |
| Kilroo | I'm pretty sure the answer is no. | 18:28 |
| Kilroo | I am not sure what would happen if you explicitly said to bzr add core/data/test.txt from /repos/site, but I'm fairly certain that once you've ignored core from in site, it never bothers to look at core or anything in it unless you specifically tell it otherwise. | 18:30 |
| Kilroo | I guess I'd just test it, if I were you. | 18:30 |
| bendj | Kilroo: Sound reasonable, too. So, likely that /myrepo/extrepo/YArepo would have to be 'bzr init'-ed as it's OWN standalon repo, and managed separately? | 18:31 |
| Kilroo | I honestly don't know. You're beyond my level of experience here. I haven't ever needed to deal with a nested repository or a nested tree or anything...I usually have something along the lines of /foo/bar as a no-trees shared repository, containing /foor/bar/trunk and /foo/bar/feature/{baz,wiz,woz} | 18:34 |
| Kilroo | and then /foo/checkouts/bar, which I switch among the relevant branches | 18:34 |
| bendj | Kilroo: Thanks, then. This all mostly (made) sense to me, until I was faced with this nesting bit ... then got a bit murky. Like you said, testing/monkeying probably a good-thing. | 18:36 |
| Kilroo | Good luck. | 18:36 |
| bendj | ta! | 18:39 |
| === lionel_ is now known as lionel | ||
| === jkakar_ is now known as jkakar | ||
| === nlisgo_ is now known as nlisgo | ||
| mwhudson | hazmat: yay for https://code.edge.launchpad.net/~hazmat/loggerhead/speed-rules | 20:51 |
| rniamo | hi | 20:59 |
| rniamo | is there a web interface for bzr which is better than loggerhead and lighter than redmine or trac ? | 21:00 |
| rniamo | (better = you can download folder for example and having color syntax) | 21:00 |
| mwhudson | rniamo: loggerhead has coloured syntax if you have pygments installed | 21:01 |
| mwhudson | and there's a patch for downloading a folder somewhere i think | 21:01 |
| rniamo | mwhudson : ok ill try, thanks, | 21:01 |
| rniamo | i didn't succeed to install the patch correctly | 21:01 |
| mwhudson | ah :/ | 21:01 |
| rniamo | when i click on download i had an error, something like loggerhead/static/projectxxx.tgz doesn't exist | 21:02 |
| Peng | ..../static/? That sounds totally wrong. | 21:04 |
| rniamo | mwhudson : i've installed pigments and i have no coloured syntax, where should i have to active it ? | 21:04 |
| rniamo | Peng : yes, totally but i merge manually so i can have forgotten something. I installed loggerhead from ubuntu packages | 21:05 |
| Peng | rniamo: You don't have to activate it. Um, what version of Loggerhead? | 21:06 |
| rniamo | Peng : 1.17 | 21:07 |
| Peng | Yeah, that should support it. | 21:08 |
| rniamo | :( | 21:08 |
| rniamo | do i have to set language somewhere ? | 21:09 |
| Peng | It auto-detects it, which usually succeeds, unless the file is non-tiny, but the alternative would be risking exponential runtime by Pygments, so... | 21:11 |
| rniamo | Peng : ok, coloured syntax is ok, maybe the file was too tiny | 21:15 |
| rniamo | or maybe i had to restart loggerhead | 21:15 |
| rniamo | is there a simple solution to download a folder as tar/zip or anything else from loggerhead ? | 21:15 |
| rniamo | how to install the "download" patch on loggerhead ? | 21:27 |
| rniamo | i have this erreor when i want to install the download as tar patch : http://www.friendpaste.com/28UailBMDogGgC6q9AHuFm | 21:32 |
| Peng | rniamo: Yes, you had to restart Loggerhead. | 21:32 |
| rniamo | Peng : it's ok for coloured syntax, thanks | 21:32 |
| jelmer | how do I recursively ignore everything under a directory? | 23:18 |
| mwhudson | jelmer: hello | 23:18 |
| Meths | Something like this I believe: 'bzr ignore "dir/**/*"' | 23:21 |
| === Leonidas_ is now known as Leonidas | ||
| jelmer | mwhudson: moin | 23:23 |
| mwhudson | jelmer: some interesting seeming bzr-git commits over the weekend :) | 23:24 |
| mwhudson | jelmer: did you basically drop the trees table from the git.db file? | 23:24 |
| jelmer | mwhudson: yeah | 23:24 |
| mwhudson | (bah) | 23:25 |
| mwhudson | jelmer: cool | 23:25 |
| mwhudson | jelmer: have you tested it with the kernel? | 23:25 |
| jelmer | mwhudson: not yet, there's still some issues to work out | 23:25 |
| mwhudson | jelmer: what's the migration plan? is the file still called 'git.db'? | 23:25 |
| mwhudson | ah ok | 23:25 |
| mwhudson | i guess we shouldn't try to sneak a bzr-git update into the next launchpad release then :) | 23:25 |
| mwhudson | grr^2 | 23:26 |
| jelmer | mwhudson: the file is still called git.db, but I've also worked on a BTreeIndex-based map | 23:26 |
| jelmer | which is significantly faster | 23:26 |
| mwhudson | jelmer: ah ok | 23:27 |
| jelmer | mwhudson: do you know the pydoctor maintainer for Debian/Ubuntu? | 23:43 |
| jelmer | it seems it's out of date for python2.6.. | 23:43 |
| mwhudson | jelmer: no | 23:49 |
| mwhudson | i guess i could make a release or something and try and sneak that into lucid | 23:49 |
| jelmer | mwhudson: that'd be great | 23:50 |
| mwhudson | jelmer: can you upload it to debian, or do we need to try to find the maintainer? | 23:54 |
| jelmer | mwhudson: we need to find the maintainer, but it seems it's team maintained and I know the maintainer who's done most of the uploads so far | 23:55 |
| jelmer | mwhudson: if you can get a proper release out I'd be happy to take care of getting it packaged and into debian | 23:56 |
| mwhudson | jelmer: http://people.canonical.com/~mwh/pydoctor-0.3.tgz ? | 23:56 |
| mwhudson | -? | 23:56 |
| mwhudson | sha1 5fb79e1d84cc729e5731ff5a69275e5087b3e59c fwiw | 23:57 |
| Tak | is there a quick way to determine at what bzr version a method got added? (specifically diff.get_trees_and_branches_to_diff) | 23:57 |
| jelmer | mwhudson: wow, that was quick :-) | 23:57 |
| Tak | also, is anyone seeing issues using bzr with python2.6? (I'm seeing what appears to be filehandle leaks) | 23:58 |
| mwhudson | sdist doesn't take too long | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!