| Peng_ | lifeless: The LP URL isn't stored anywhere. The code can usually guess it, but not always. | 00:13 |
|---|---|---|
| Peng_ | lifeless: Plus, not every branch is mirrored on LP. | 00:13 |
| Peng_ | lifeless: It's probably still do-able, but it requires a little thinking, which I haven't wanted to do. :P | 00:13 |
| SamB_XP | Peng: americans these days! | 00:14 |
| wgrant | Why are the branches not hosted on LP? | 00:14 |
| Peng_ | wgrant: Why don't I host my branches on LP? | 00:14 |
| wgrant | Peng_: Right. | 00:14 |
| Peng_ | wgrant: Eh. If I did host them on LP, I'd only be using my VPS for ntp and irssi. How'd that be fun? | 00:15 |
| SamB_XP | Peng: it sounds better if you claim to be "testing" it ;-P | 00:18 |
| === davidstrauss__ is now known as davidstrauss | ||
| igc | morning (ish) | 01:41 |
| poolie | hello | 01:41 |
| poolie | how're the old positrons? :) | 01:41 |
| offby1 | they keep annihilating the electrons. | 01:47 |
| === jam1 is now known as jam | ||
| igc | hi poolie! | 02:30 |
| poolie | hi igc | 02:30 |
| igc | poolie: how's the email mountain? :-) | 02:30 |
| poolie | substantial :) | 02:31 |
| lifeless | .-=^=-. | 02:34 |
| jam | mwhudson: question about python for you | 03:54 |
| jam | It seems that subclassing from tuple gives me an object that is 8-bytes bigger | 03:54 |
| jam | until I add an attribute, then it seems to grow a __dict__ and blossom another 140 bytes | 03:54 |
| lifeless | heh | 03:54 |
| jam | Even adding __slots__ = () | 03:54 |
| jam | it still seems to have the extra 8 bytes | 03:54 |
| jam | do you know why? | 03:54 |
| lifeless | python type vs native type? | 03:55 |
| jam | lifeless: yeah, I was worried that the pure-python StaticTuple would have a __dict__ all the time, so I added __slots__ = (), only to find 0 change on normal instances. | 03:55 |
| === Adys_ is now known as Adys | ||
| jam | anyway, I haven't found the code that handles subclassing builtins, other than "tuple_subtype_new" | 03:57 |
| jam | but that doesn't seem to indicate what 'tp_alloc' is set to for the new class instance | 03:57 |
| spiv | jam: hmm, that does seem to be the key question | 03:59 |
| jam | spiv: anyway, I can live with 8 bytes overhead for StaticTuple instances when they don't compile extensions | 03:59 |
| jam | versus 28 for the ST instance if we wrapped a tuple instead of subclassing it | 04:00 |
| mwhudson | jam: not off the top of my head | 04:00 |
| spiv | jam: gdb says PyType_GenericAlloc | 04:01 |
| jam | mwhudson: I thought you might have some inkling, as I thought you mentioned when 'tp_dict' is negative | 04:01 |
| mwhudson | jam: i probably knew once :) | 04:01 |
| jam | spiv: right and that is just based on "tp_itemsize" and "tp_basicsize" | 04:01 |
| jam | so we need to figure out what is setting "tp_basicsize" | 04:01 |
| * igc lunch | 04:02 | |
| spiv | jam: for me, the tp_itemsize and tp_basicsize are the same for a trival "class T(tuple): __slots__ = ()" and tuple. | 04:03 |
| jam | spiv: so I posted some testing here: | 04:04 |
| jam | https://code.launchpad.net/~jameinel/bzr/2.1-pure-static-tuple/+merge/14006 | 04:04 |
| jam | can you reproduce? | 04:04 |
| jam | (creating 1M instances of a child of tuple is 8 bytes more memory than 1M instances of tuple) | 04:04 |
| jam | which is 16 bytes more memory than 1M instances of _static_tuple_c.StaticTuple | 04:04 |
| jam | regardless of __slots__ | 04:04 |
| jam | spiv: I *do* see that if you have "add_dict" set, then it adds a pointer to the end of the instance. And I think I see that add_dict should be set to 0 if __slots__ is set. | 04:07 |
| jam | but that doesn't seem to be what I'm seeing in practice... | 04:08 |
| lifeless | sure its not a type pointer? | 04:11 |
| * lifeless is speculating | 04:11 | |
| jam | lifeless: all objects in python have a type pointer, even 'tuple' | 04:12 |
| jam | so it should be able to just re-use that location | 04:12 |
| jam | since it is fixed for inspection | 04:12 |
| jam | it could be a mro or something like that | 04:12 |
| jam | however, looking at "typeobject.c" | 04:13 |
| jam | essentially "type->tp_basicsize = base->tp_basicsize + (add_dict ? 1 : 0) + (add_weakref ? 1 : 0) + (num_slots) | 04:13 |
| jam | spiv: in my testing, I even see it if I comment out all of StaticTuple's implementation except for the __slots__ statement. | 04:17 |
| spiv | jam: I see no memory difference under 2.6 between [tuple([n]) for n in range(1000000)] and s/tuple/T/, where T is that trivial subclass with empty __slots__. | 04:18 |
| jam | spiv: oddly enough, I *do* | 04:19 |
| spiv | jam: I *do* see different results with zero-length tuples | 04:20 |
| spiv | i.e. pass [] instead of [n] | 04:20 |
| jam | spiv: well there it is because 'tuple()' is a singleton | 04:20 |
| spiv | Right. | 04:20 |
| spiv | jam: my testing method is pretty simple, I'm running this: | 04:21 |
| spiv | python -c "T = type('T', (tuple,), {'__slots__': ()}); x = [T([n]) for n in range(1000000)]; print 'ready'; raw_input()" | 04:21 |
| spiv | jam: and then looking at /proc/<pid>/status | 04:21 |
| lifeless | jam: what python version do you have? | 04:21 |
| jam | lifeless: 2.6.2 | 04:21 |
| lifeless | spiv: and you ? | 04:21 |
| jam | spiv: "trace.debug_memory()" on windows | 04:21 |
| jam | which looks at /proc/pid/status on linux | 04:21 |
| spiv | 2.6.4rc2 | 04:21 |
| lifeless | right | 04:21 |
| lifeless | I suspect its the __slots__ change which broken boost-python in 2.6.3 | 04:22 |
| * lifeless handwaves furiously | 04:22 | |
| jam | lifeless: that could be... | 04:22 |
| jam | spiv: on Python 2.4.3 under linux I see no difference with __slots__ and 8 bytes without __slots__ | 04:27 |
| spiv | jam: *nod* | 04:31 |
| jam | spiv: I just upgraded to python 2.6.4, and I still see the same thing... | 04:34 |
| jam | very very strange | 04:34 |
| jam | w/ or w/o __slots__ it adds 8 bytes | 04:35 |
| jam | maybe an alignment thing? | 04:35 |
| jam | subclasses not being as tightly aligned... | 04:35 |
| jam | anyway, the merge proposal is still good to have, as it helps somewhere (on spiv's machine. :) | 04:36 |
| * jam wanders off to bed | 04:45 | |
| spiv | jam: I just hit approve, btw | 04:46 |
| spiv | jam: in case you want to do a PQM submission from bed ;) | 04:46 |
| igc | lifeless: do your changes in dirstate2 reduce it's size? IIRC, you were looking to take one of the 'columns' out weren't you? | 05:40 |
| lifeless | igc: I haven't done that | 05:56 |
| wgrant | Will anything blow up if I symlink a shared repo's .bzr into a subdirectory, in order to segregate my branches? | 06:29 |
| poolie | wgrant: the .bzr/repository directory? | 06:30 |
| poolie | mm | 06:30 |
| poolie | it's not really supported | 06:30 |
| wgrant | poolie: I was thinking the entire .bzr. | 06:30 |
| poolie | what exactly do you mean? | 06:30 |
| wgrant | poolie: I have ~/launchpad/lp-branches with lots of branches in it. | 06:31 |
| wgrant | I have a particular line of work which will need about a dozen branches. | 06:31 |
| wgrant | I want this to live in a subdirectory. | 06:31 |
| wgrant | So the related branches are obvious and separated from the rest. | 06:32 |
| poolie | ok | 06:32 |
| lifeless | igc: I'd be delighted to brain dump/find my old notes on removing columns | 06:32 |
| lifeless | wgrant: it will work fine | 06:32 |
| poolie | so i don't think you need to do anything with symlinks | 06:33 |
| lifeless | wgrant: but its not need, just use a subdir | 06:33 |
| wgrant | lifeless: That's what I thought, but best to be safe. Thanks. | 06:33 |
| poolie | just make a subdir | 06:33 |
| lifeless | wgrant: 'mkdir project'; bzr branch trunk project/1 | 06:33 |
| lifeless | etc | 06:33 |
| spiv | wgrant: you can have an arbitrary number of subdirectories between a repo and a branch, though.. | 06:33 |
| wgrant | spiv: Oh, it will look all the way up? | 06:33 |
| lifeless | wgrant: yes | 06:33 |
| wgrant | That's convenient. | 06:33 |
| wgrant | didn't know that... | 06:33 |
| lifeless | wgrant: we aim to please | 06:33 |
| igc | lifeless: I think there was a bug report for removing a column. Maybe add them there? | 06:33 |
| wgrant | lifeless: You succeed. | 06:33 |
| spiv | :) | 06:33 |
| lifeless | igc: are you considering picking up dirstate2 and running with it? | 06:34 |
| lifeless | I won't be following up for a while.. | 06:34 |
| igc | wgrant: if there's somewhere in the doc I should change to make that more obvious, please let me know | 06:34 |
| igc | lifeless: no | 06:34 |
| igc | lifeless: I was just trying to understand some benchmark results | 06:34 |
| wgrant | igc: I haven't read the bzr docs in at least three years. I have no idea what they're like now. | 06:35 |
| igc | lifeless: see #461651 | 06:35 |
| igc | wgrant: I guess that answers that question :-) | 06:36 |
| lifeless | bug 461651 | 06:36 |
| ubottu | Launchpad bug 461651 in bzr "Implicit packing during branch is often suboptimal" [Medium,Invalid] https://launchpad.net/bugs/461651 | 06:36 |
| lifeless | igc: yes, I saw that | 06:36 |
| igc | 11M for a FireFox dirstate seemed large | 06:37 |
| lifeless | igc: getting rid of the the extra tree columns wouldn't shrink that any | 06:41 |
| lifeless | as its not a merged dirstate | 06:41 |
| igc | lifeless: ah - ok. Thanks | 06:42 |
| vila | hi all | 07:10 |
| poolie | hello vila! | 07:10 |
| vila | welcome back poolie :) | 07:11 |
| poolie | thanks, it's good to be back | 07:12 |
| igc | hi vila! | 07:18 |
| wgrant | igc: So, I decided I should read through some of the docs. They really are excellent these days. | 07:24 |
| wgrant | (where do I file typos in them?) | 07:24 |
| igc | wgrant: the docs are genuinely a community effort but, hey, I'll take the credit :-) :-) | 07:25 |
| igc | wgrant: unfortunately, it depends | 07:25 |
| igc | wgrant: most of the docs are in the core but some, like the migration docs, are separate projects | 07:25 |
| igc | wgrant: if you file doc bugs against the core, we can shuffle the assigned project if appropriate | 07:26 |
| wgrant | igc: 'Why Switch to Bazaar?' is the one I just found a typo in. | 07:26 |
| igc | wgrant: it's in lp:bzr-migration-docs | 07:26 |
| wgrant | igc: Thanks. | 07:27 |
| wgrant | igc: One other thing I noticed (horrible horrible nitpicking, I know) is that the migration docs don't seem sure on whether to use sentence or title case for various levels of headings. It just makes it look that bit unpolished. | 07:32 |
| igc | wgrant: the unwritten rule is Title case for document headings, sentence case otherwise | 07:33 |
| lifeless | igc: I'd be a lot happier if all the docs were in the core | 07:37 |
| lifeless | so the debian package would include them | 07:37 |
| igc | lifeless: all the docs can't be in the core - many of them are built from plugins | 07:38 |
| lifeless | igc: I thought that was just the plugin guide one? | 07:39 |
| igc | lifeless: other like the website and doc-website bridge multiple releases | 07:39 |
| lifeless | igc: well, the website is differnet | 07:39 |
| lifeless | its /docs/ I care about | 07:40 |
| * wgrant will submit a couple of migration docs MPs later tonight. | 07:40 | |
| lifeless | if the ReST were generated and committed to trunk, then it could be included in the deb package | 07:40 |
| === GaryvdM is now known as Guest54289 | ||
| === GaryvdM_ is now known as GaryvdM | ||
| GaryvdM | Hi lifeless | 08:21 |
| GaryvdM | lifeless: I'm looking at bug 320236. | 08:21 |
| ubottu | Launchpad bug 320236 in bzr-search "Index authors" [Wishlist,Triaged] https://launchpad.net/bugs/320236 | 08:21 |
| GaryvdM | lifeless: Would it be allright if specified the field that a term applies to in the document_key | 08:21 |
| GaryvdM | lifeless: e.g. for authors/commiter : ('r','a',rev_id) | 08:22 |
| lifeless | I'd hesitate to do that | 08:23 |
| lifeless | its not a good use of the index space | 08:23 |
| lifeless | either index with a more appropriate term | 08:23 |
| lifeless | ('author', 'fred') | 08:24 |
| lifeless | or query the matching revisions to filter more | 08:24 |
| GaryvdM | lifeless: Ok - I think I'll index with a more appropriate term | 08:24 |
| lifeless | GaryvdM: my advice though | 08:25 |
| lifeless | GaryvdM: post process | 08:25 |
| lifeless | accessing revisions is fast | 08:25 |
| lifeless | and you'll already have a short list | 08:25 |
| GaryvdM | lifeless: Ok | 08:25 |
| lifeless | adding more data to the search index is likely to just slow things down | 08:25 |
| lifeless | *if* data shows that it would make a huge difference, then I'll happily drill into this in more detail with you | 08:26 |
| lifeless | consider though - how many revisions would have a hit for 'Robert' and not have that be author/committer | 08:27 |
| lifeless | [remember that you won't be comparing against file texts here] | 08:27 |
| GaryvdM | lifeless: Yes - that makes sense. | 08:28 |
| vila | lifeless: you know there are still 3 test failures for loom ? (Related to switch) | 08:40 |
| lifeless | vila: no, I didn't | 08:40 |
| lifeless | unless, perhaps, I put up a branch for review | 08:40 |
| vila | lifeless: ./bzr selftest -s bb.test_switch trigger them all | 08:44 |
| * igc dinner | 08:47 | |
| lifeless | vila: have you filed a bug on loom? if not, please do so | 08:49 |
| vila | lifeless: ok | 08:51 |
| vila | bug #461743 | 08:54 |
| ubottu | Launchpad bug 461743 in bzr-loom "test failures related to switch" [Undecided,New] https://launchpad.net/bugs/461743 | 08:54 |
| === GaryvdM_ is now known as GaryvdM | ||
| hsn | anybody have experience with bzr support in maven? it seems that bzr protocol is unsupported and sf.net servers does not provide http access to bzr repo | 09:36 |
| GaryvdM | Hi igc | 12:27 |
| igc | hi garyvdm | 12:28 |
| GaryvdM | igc: I've been thinking about rename/move for qbzr. | 12:29 |
| GaryvdM | I want to hear your ideas on ui. | 12:29 |
| GaryvdM | And bounce some of my own. | 12:29 |
| igc | bug 298242 | 12:31 |
| ubottu | Launchpad bug 298242 in qbzr "New dialog for auto rename" [Low,Confirmed] https://launchpad.net/bugs/298242 | 12:31 |
| igc | garyvdm:^ | 12:31 |
| GaryvdM | So the idea I have is that from the treewidget (i.e. qcommit, and qbrowse) you can right click, rename, or you can drag and drop move | 12:32 |
| igc | garyvdm: sounds great | 12:33 |
| GaryvdM | igc: Sorry - I forgot that you had the right up in the bug. | 12:33 |
| igc | garyvdm:I like you ideas | 12:34 |
| GaryvdM | And the other idea that I have is that you can highlight a missing file, and a unversioned file, and right click, "Mark as Move" | 12:34 |
| GaryvdM | igc: Cool | 12:34 |
| igc | we could combine them by just showing the dialog I outlined, with ... | 12:34 |
| igc | the relevant radio button pre-selected | 12:35 |
| GaryvdM | igc: I see | 12:35 |
| igc | drag n drop would be really nice for move | 12:37 |
| igc | garyvdm:^ | 12:37 |
| igc | garyvdm: it's my bed time - any other questions? | 12:39 |
| GaryvdM | igc: Nope. Thanks for your time. | 12:39 |
| GaryvdM | igc: Sleep well. | 12:39 |
| igc | garyvdm: thanks! | 12:39 |
| igc | night all | 12:40 |
| === pickscrape_ is now known as pickscrape | ||
| === mrevell is now known as mrevell-lunch | ||
| === lamont` is now known as lamont | ||
| === mrevell-lunch is now known as mrevell | ||
| jam | morning all | 13:53 |
| vila | morning jam !!! | 13:57 |
| vila | did you intended to vote but forgot on the dwim revspec ? | 13:58 |
| vila | jam: the tone of your comment sounds like a vibrant approve but... :) | 14:00 |
| jam | vila: I intended to enter the discussion. | 14:01 |
| jam | though I do approve the change | 14:01 |
| jam | vila: there, feel better :) | 14:02 |
| vila | lol, thanks for fullermd :) | 14:03 |
| jam | Peng: https://code.edge.launchpad.net/~jameinel/bzr/2.1-st-from-iterable/+merge/14027 | 14:09 |
| jam | vila: I'll go ahead and submit his patch then. | 14:13 |
| vila | jam: I'm doing right now if you haven't started... | 14:14 |
| jam | vila: ah, please do | 14:14 |
| jam | I just didn't see it in PQM yet | 14:14 |
| vila | pqm'ed | 14:14 |
| vila | I had some... weirdness-I-dont-even-want-to-start-looking-at | 14:15 |
| jam | rockstar: are you around for a bit of a chat? | 14:15 |
| Peng_ | The question is, how do I mark my merge proposal as superseded? | 14:19 |
| gioele | mwhudson: hi, have you got a tarball of the generated bzrlib API? | 14:37 |
| jam | Peng_: you can mark it as "work in progress" and it will be hidden from the review queue | 14:58 |
| jam | or "Merged" if you want to treat it as merged into mine... | 14:59 |
| jam | I don't have a better way | 14:59 |
| jam | Peng_: Or just wait until the patch lands and see if lp marks it merged for you | 15:01 |
| rockstar | jam, hi | 15:09 |
| jam | good morning rockstar | 15:10 |
| jam | I hope you've had your coffee this morning :) | 15:10 |
| Peng_ | jam: I'm confident that LP will mark it merged. | 15:10 |
| jam | I'd like to pick your brain a bit about things that the bzr team can do to help you guys | 15:10 |
| Peng_ | Huh, set(['foo bar']) is a lot faster than set(StaticTuple('foo bar')) | 15:10 |
| jam | most notably, things that *I* should focus on :) | 15:10 |
| rockstar | jam, great. I don't drink coffee shop, but I'm about to head out to one. | 15:11 |
| === cody-somerville_ is now known as cody-somerville | ||
| rockstar | jam, can it wait about an hour? I have some branches to land. | 15:11 |
| jam | rockstar: absolutely | 15:11 |
| rockstar | jam, great. | 15:11 |
| Bear10_ | when I do a bzr add dir it says it ignored 2 files but doesn't say which | 15:13 |
| Bear10_ | any ideas how to find out which? | 15:13 |
| jam | Bear10_: bzr ignored | 15:15 |
| Bear10_ | thanks | 15:24 |
| Bear10_ | see :) | 15:25 |
| Bear10_ | woops wrong window | 15:25 |
| === deryck is now known as deryck[lunch] | ||
| Peng_ | jam: Thanks for all of your help recently. :) | 15:40 |
| jam | Peng_: thanks for your interest | 15:48 |
| Bear10_ | has anyone experienced problems where the icons just never update, and you have to manually update to see if your still on the same version as the binded branch? | 16:04 |
| === beuno is now known as beuno-lunch | ||
| Arc | does bazaar support commit hooks such as buildbots, special handling of certain file types (ie, unzipping an ODF so it's contents are stored in VCS and diffed vs the zip as a binary blob, metadata checked and passed, etc) | 16:49 |
| Peng_ | Bazaar does have good hook support, so they can probably be used for all of that. | 16:49 |
| Arc | do the hook distribute to users? | 16:50 |
| Arc | or do they need to be manually installed by each committer | 16:50 |
| Arc | looking at bazaar from the mercurial model | 16:52 |
| Arc | especially for hosting media | 16:52 |
| Peng_ | Arc: Manually installed. | 16:54 |
| Arc | so we're not really better off with bzr over hg | 16:55 |
| Arc | except for perhaps the licensing issue, which hg is very sub-optimal for | 16:56 |
| Peng_ | It is? | 16:57 |
| jfroy|work | mornin' | 16:57 |
| Arc | GPLv2 only vs GPLv2+ | 16:57 |
| Arc | GPLv2-only is not AGPLv3 compatible | 16:57 |
| Peng_ | Arc: I think they're working on GPLv2+. | 16:57 |
| === deryck[lunch] is now known as deryck | ||
| Peng_ | Or already did it. | 16:57 |
| Arc | really? I thought their maintainer was dead set against it | 16:58 |
| Peng_ | Arc: I think he suddenly and quietly changed his mind. I'm not sure, though. | 17:00 |
| Arc | ok | 17:00 |
| james_w | Is GPLv2+ AGPLv3 compatible? | 17:02 |
| james_w | I wouldn't have thought that it would be | 17:02 |
| Arc | yes, because the GPLv3 is AGPLv3 compatible | 17:03 |
| Arc | GPLv2->GPLv3->AGPLv3 | 17:04 |
| Arc | GPLv3 section 13 makes it so | 17:04 |
| james_w | ah, thanks | 17:06 |
| Arc | we're building a web framework for our project that is licensed under the AGPLv3, and would really like to get mercurial integration | 17:07 |
| Peng_ | Arc: See the thread in mercurial-devel "Re-licensing email", starting 2009-10-14. | 17:11 |
| Arc | Peng_: i just read, thanks :-) | 17:12 |
| Tak | is there anything special I need to do to `import bzrlib` on windows, having installed with the default installer? | 17:14 |
| Tak | aha, got it! | 17:17 |
| Tak | didn't think to look in the zipfile | 17:17 |
| cjwatson | jelmer: can I interest you in what appears to be a bzr-svn data corruption bug? it's happening to the grub project, who are just looking at adopting bzr; unfortunately at the moment they're using the bzr/bzr-svn from Debian lenny (but could be persuaded to upgrade if I can demonstrate that some of their problems would go away with newer code) | 17:32 |
| cjwatson | jelmer: jml took a look at it here and said "uh, this probably needs John or Jelmer" :-) | 17:33 |
| Tak | anyone with python on win64 want to do a `python -c "import sys; print sys.platform"` for me? | 17:34 |
| jml | cjwatson, I was _so_ much more eloquent than that. | 17:34 |
| jml | cjwatson, I was using internal rhyme and everything. | 17:35 |
| cjwatson | jml: :-) | 17:35 |
| Peng_ | mwhudson: ping, if you don't mind doing some hand-holding. | 17:36 |
| Peng_ | Tak: Maybe try #python. | 17:36 |
| Peng_ | What OSes are used at Canonical? Just Ubuntu? :D | 17:37 |
| Tak | or maybe not!!! | 17:37 |
| Peng_ | Tak: Why not? | 17:37 |
| GaryvdM | Peng_: bzr is cross platform! | 17:40 |
| === beuno-lunch is now known as beuno | ||
| cjwatson | jelmer: bug 462109, if you're interested | 17:46 |
| ubottu | Launchpad bug 462109 in bzr-svn "corrupted branch with bzr 1.5, bzr-svn 0.4.10, and roundtripping" [Undecided,New] https://launchpad.net/bugs/462109 | 17:46 |
| Peng_ | mwhudson: Semi-unping. (Sorry, I know that's not very helpful.) | 17:50 |
| Tak | in case anybody cares, the result is "win32" | 17:55 |
| === EdwinGrubbs is now known as Edwin-lunch | ||
| GaryvdM | Hi | 18:02 |
| GaryvdM | Is there a way to get a tree for NULL_REVISION without a reference to a repository? | 18:03 |
| GaryvdM | Ah - nvm - I grep and I grep, but I could not find. I asked here, then switch back to my IDE, and it was right in my face :-P | 18:05 |
| GaryvdM | RevisionTree(self, Inventory(root_id=None), NULL_REVISION) | 18:05 |
| BrianBatchelder | I'm trying to figure out how to prevent the merging of a particular file whenever I merge between two branches. We have a hierarchical branch setup, with branch "A" as our release branch, and "A.1", "A.2", etc. as development branches. When a dev branch is ready to release, it merges to branch "A", and then that code is merged down to the rest of the development branches. But I have one branch-specific file that can't be merged during this process. | 18:30 |
| BrianBatchelder | must be version controlled, because it is needed in checkouts of the development branches. Any ideas of how to do this? Thanks. | 18:30 |
| maxb | bzr revert it in between merge and commit, always? | 18:30 |
| dash | BrianBatchelder: revert it before you commit the merge? | 18:30 |
| BrianBatchelder | I'm not the only one who does the merges, so I'd like it to be automatic. | 18:31 |
| dash | shell script time :) | 18:31 |
| BrianBatchelder | Is there a simple way to hook the merge operation and automatically revert it? | 18:32 |
| BrianBatchelder | Or perhaps limit the users who can modify that file? | 18:36 |
| === asac_ is now known as asac | ||
| mwhudson | Peng_: good <time of day> | 19:15 |
| Tak | jelmer: http://img148.imageshack.us/img148/1204/mdbzrwin32.png | 19:21 |
| Peng_ | mwhudson: Hi. :) | 19:27 |
| Peng_ | mwhudson: So anyway, never mind about the ping. I was trying to figure out loggerhead.wholehistory, and managed it well enough. | 19:33 |
| mwhudson | Peng_: cool | 19:33 |
| Peng_ | Not that I understand it, but I was able to accomplish what I was working on. :P | 19:34 |
| Peng_ | The revision graph cache is one scary data structure. :P | 19:34 |
| mwhudson | yes, and it should be fixed by deletion really | 19:43 |
| mwhudson | otoh, we can't escape the need for revision numbering for now | 19:43 |
| === Edwin-lunch is now known as EdwinGrubbs | ||
| jfroy|work | jelmer: is the svn revno corresponding to a particular bzr revision available to hooks? | 20:03 |
| jfroy|work | I'd like to write some sort of post-revision-push hook (if that's possible) that would need to know the corresponding svn revno (and possibly the push URL) of each pushed revision. | 20:04 |
| === rblasch_ is now known as rblasch | ||
| samokk | hey. wondering about something simple : I see that bzr 2 has a new repository format 'nearly as efficient as git', and also supports the import of git branches. if the 2a format is only nearly as efficient, then why not use git repo format by default ? | 20:46 |
| dash | git doesn't support all of bzr's features | 20:46 |
| samokk | oh ok | 20:47 |
| faheem | can anyone point me to large public bzr repos for testing? i'm using 2.0.1 | 20:56 |
| hsn | faheem: mysql | 21:02 |
| === Arc_ is now known as Arc | ||
| === Dude-X is now known as Dude-X_ | ||
| maxb | faheem: Launchpad's own source is pretty large | 21:21 |
| lifeless | faheem: what sort of testing | 21:30 |
| lifeless | hsn: mysql haven't upgraded their branches, so aren't a very good test case for testing - still performs slowly | 21:30 |
| bob2 | drizzle otoh is about to upgrade | 21:41 |
| igc | morning | 21:42 |
| lifeless | bob2: cool; I only lurk in IRC, you're in the list? | 21:49 |
| bob2 | yeah | 21:50 |
| apm121 | mysql migrate from ? svn or cvs ? | 21:52 |
| bob2 | they came from bk | 21:53 |
| wgrant | bzr-git doesn't seem to be able to branch over HTTP yet. Is that the case? | 22:25 |
| mwhudson | wgrant: it is | 22:28 |
| wgrant | mwhudson: I guess I'll do a local clone and branch from that. Thanks. | 22:29 |
| === mnepton is now known as mneptok | ||
| poolie | hello | 22:44 |
| lifeless | hi | 22:46 |
| mwhudson | i have this vague notion that bzr plugins can't be in eggs | 22:48 |
| mwhudson | is there something fundamental about this, or could it be fixed? | 22:48 |
| lifeless | mwhudson: it could be fixed I guess | 22:52 |
| lifeless | mwhudson: plugins are just packages that we do 'import bzrlib.plugins.package' | 22:53 |
| mwhudson | hm | 22:53 |
| lifeless | mwhudson: plugin loading is thus in two phases: setup an appropriate python path on bzrlib.plugins.__path__ | 22:53 |
| lifeless | scan manually for all packages in that path | 22:53 |
| lifeless | call 'import bzrlib.plugins.package' for the resulting names | 22:53 |
| mwhudson | i guess it's the "scan manually" part that goes awry with eggs? | 22:54 |
| lifeless | yes | 22:54 |
| lifeless | now, things keep getting tweaked there | 22:54 |
| lifeless | I mean to go into the code, delete all the cruft and make it simple again | 22:54 |
| lifeless | (for instance, I believe bzr in a .zip is handled differently, for no good reason) | 22:54 |
| mwhudson | so if i were to focus very narrowly on what i'm thinking about right now, which is launchpad, i could probably put (say) bzr-svn in an egg and import it by hand | 22:55 |
| lifeless | oh yes | 22:56 |
| lifeless | I'd expect that work fine | 22:56 |
| lifeless | see also IRC log for me chatting with vila about allowing specifications of individual plugins on BZR_PLUGIN_PATH | 22:56 |
| mwhudson | hmm | 23:21 |
| mwhudson | BzrError: Attempt to escape test isolation: 'file:///var/tmp/codeimport/data/worker-for-branch-1/bzr_working_tree/' [u'/tmp/testbzr-MThLsv.tmp/', 'file:///tmp/testbzr-MThLsv.tmp/', u'/tmp/testbzr-MThLsv.tmp/lp.codehosting.codeimport.tests.test_worker.TestSubversionImport.test_import/', 'file:///tmp/testbzr-MThLsv.tmp/lp.codehosting.codeimport.tests.test_worker.TestSubversionImport.test_import/', 'file:///tmp/testbzr-MThLsv.tmp/'] | 23:21 |
| mwhudson | what is this trying to tell me? | 23:21 |
| mwhudson | oh, i see | 23:23 |
| mwhudson | not the most helpful error message | 23:23 |
| spiv | No, I guess not. | 23:23 |
| johnf | jelmer: you about? | 23:24 |
| spiv | Some text like "is not inside one of" between the url and the list of acceptable locations would probably help. | 23:24 |
| spiv | And maybe "Attempt to open BzrDir outside test isolation" would be better too. | 23:26 |
| johnf | anyone know if there is a solution to this problem when running bzr check "reason: Parent not in inventory." It is from a branch that was originally branched from SVN | 23:26 |
| mwhudson | spiv: yeah | 23:26 |
| spiv | Huh, PQM is only just now playing my merge requests from yesterday. I wonder where they got stuck. | 23:28 |
| poolie | hello spiv, igc, mwh | 23:36 |
| igc | hi poolie | 23:55 |
| poolie | hi there igc | 23:57 |
| igc | poolie: can you review https://code.edge.launchpad.net/~ian-clatworthy/bzr/filtering-revert-bug/+merge/14022 today? Given you're not working on the content filtering bug, I'm going to take it back on board. This is step 1. | 23:58 |
| poolie | ok, i'll try | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
