| lifeless | spiv: hey, you might like to know your quiescing code for bzr+ssh bazaar.launchpad.net is now live in HA mode. | 06:21 |
|---|---|---|
| poolie | just in time :) | 06:23 |
| poolie | anyone up for a review? https://code.launchpad.net/~mbp/bzr/test-errors/+merge/64485 | 07:12 |
| jelmer | poolie: sure, I'll have a look | 07:55 |
| Noldorin | ah hi jelmer | 07:56 |
| poolie | hi there | 07:56 |
| Noldorin | seems weekend is not a godo time to catch you ;-) | 07:56 |
| jelmer | hi Noldorin | 07:57 |
| jelmer | hi poolie | 07:57 |
| jelmer | Noldorin: Usually it is, but I spent 27 hours of this one on trains | 07:57 |
| Noldorin | ah i see | 07:58 |
| Noldorin | soudns fun. :-P | 07:58 |
| Noldorin | jelmer, well if you got my email, i replied to your messages...had actually already submitted the bug report on friday when speaking to you :-) | 07:59 |
| Noldorin | jelmer, you gone again?? | 08:37 |
| jelmer | Noldorin: no, sorry, but going through mail backlog at the moment | 08:42 |
| jelmer | Noldorin: I'll follow up to the bug | 08:42 |
| Noldorin | jelmer, ok, please :-) | 08:44 |
| Noldorin | jelmer, this is very imporant to me, so i will be happy to help you with this. have some free time either now or tomorrow night (for you) | 08:44 |
| jelmer | Noldorin: unfortunately it just requires a lot of time debugging | 08:48 |
| jelmer | Noldorin: I can provide you with some hints if you would like to have a look at it yourself | 08:48 |
| Noldorin | jelmer, certainly... | 08:49 |
| Noldorin | jelmer, obviously leave it on your own task list, but it doesn't hurt for me to have a go as well. :-) | 08:49 |
| Noldorin | as i understand, the issue is a missing item in the Git database...don't know anything more | 08:49 |
| jelmer | Noldorin: one of the bzr-git routines doesn't properly generate an entry for a particular src directory in the _revision_to_objects method | 08:51 |
| jelmer | it seems to happen specifically with r47 of ircdotnet, but I'm not sure why (which change in that revision is problematic) | 08:51 |
| jelmer | a good first step might be to try to push r46 into a git repository, and confirm that that works | 08:52 |
| Noldorin | interesting | 08:52 |
| jelmer | and then see if you can reproduce the issue with a subset of the changes in r47 | 08:52 |
| Noldorin | jelmer, what do you mean "particular src directory"? | 08:52 |
| jelmer | Noldorin: see the comments on the bug report | 08:53 |
| Noldorin | jelmer, link please? for some reaons i am not getting notifications :-( | 08:54 |
| jelmer | Noldorin: Sorry, I don't have it handy here. You should have the bug# though, as you filed the bug. | 08:57 |
| Noldorin | hah i wouldn't assume | 08:58 |
| Noldorin | i will have to search for it... | 08:58 |
| Noldorin | i rely on LP to update me. oh well | 08:58 |
| Noldorin | got it | 09:00 |
| Noldorin | jelmer, what does Triaged mean? | 09:08 |
| poolie | it means accepted by a developer | 09:11 |
| Noldorin | ok heh | 09:11 |
| Noldorin | such an obscure term in normal English ;-) | 09:12 |
| poolie | heh, http://markmail.org/message/jt2psgctve3riact#query:+page:1+mid:jt2psgctve3riact+state:results | 09:12 |
| jelmer | poolie: great to hear about HA for codehosting, looking forward to seeing jam & spiv's forking server code land! | 09:13 |
| poolie | isn't it great | 09:13 |
| spiv | lifeless: ha, thanks :) | 09:17 |
| Noldorin | jelmer, yes pushing as r46 works... will investigate the issue tomorrow; thanks! | 09:26 |
| Noldorin | good night for now | 09:27 |
| jml | loom is so close to being great | 12:16 |
| jml | anyone seen mgz around recently? | 12:52 |
| jelmer | jml: I think I talked to him last week | 12:57 |
| GRiD | hi everyone. i'd like to try some bzr hacking. if anyone has any suggestions on a good starter bug for exploring the code base, let me know. otherwise i'll pick the first "easy" bug that makes sense to me. | 13:30 |
| jelmer | GRiD: I think the bugs tagged "easy" are indeed the best place to start | 13:37 |
| GRiD | jelmer, ok thanks | 13:46 |
| dreamkxd | Is there anyone here to answer my bzr-svn problems? | 13:59 |
| dreamkxd | Silence.... | 14:05 |
| jelmer | dreamkxd: can you be more specific? | 14:06 |
| jelmer | dreamkxd: what is your question? | 14:07 |
| dreamkxd | Well, I want to modify bzr-svn to handle multiple branch in an single path, where to start? | 14:14 |
| dreamkxd | Or in other words, I want to ignore some content in svn branch. how to do that. | 14:15 |
| jelmer | dreamkxd: those two things seem like different things | 14:20 |
| jelmer | dreamkxd: what do you mean with multiple branches in a single path? | 14:20 |
| dreamkxd | I think they can be handle in the same way. | 14:20 |
| jelmer | ah, you're luoyonggan | 14:20 |
| dreamkxd | Yes. | 14:20 |
| dreamkxd | For example there is an path /branches/branchA/BranchB | 14:20 |
| dreamkxd | ?? | 14:21 |
| jelmer | right | 14:22 |
| jelmer | at the moment you would have a different layout for interpreting that layout differently | 14:22 |
| dreamkxd | so, the files under BranchB should be fully ignore by branchA | 14:22 |
| dreamkxd | yes. that's right, that's why such an condition appeared. | 14:22 |
| jelmer | dreamkxd: that's not really possible without changing the mapping format, and breaking all existing revision ids | 14:23 |
| dreamkxd | So, that's an impossible task? | 14:23 |
| dreamkxd | almost? | 14:23 |
| jelmer | dreamkxd: yes, and I don't really see the value of branches that exclude certain data. I don't think it's a natural way to work, because "svn co" works with full subtrees. | 14:24 |
| dreamkxd | That's the problem, svn co works with full subtrees. | 14:24 |
| dreamkxd | but bzr is dvcs. So it's didn't accept redundant data in the repo, or the repo will be very large. | 14:25 |
| dreamkxd | that's the value of bzr-svn. and bzr-svn should be able handle such an condition. | 14:25 |
| jelmer | dreamkxd: The problem with excluding certain files is that it creates different history | 14:26 |
| jelmer | ergo, different revision ids that are incompatible with checkouts that do have all the files | 14:26 |
| jelmer | Excluding things like big files seems like a better idea for just the working tree (which bzr already supports) or by using ghosts. | 14:27 |
| jelmer | Sorry, I meant to say: | 14:27 |
| jelmer | It seems like a better idea to just limit what files are created in the working tree (which bzr already supports) or by using ghosts. | 14:28 |
| jelmer | dreamkxd: I don't have any objections to support for considering multiple things in a path branches | 14:28 |
| dreamkxd | to specify the file name? | 14:28 |
| jelmer | dreamkxd: but I don't think considering /branches/branchA/branchB a branch means that /branches/branchA would no longer include the contents of BranchB | 14:29 |
| dreamkxd | I am just considerating the fact condition. | 14:29 |
| jelmer | dreamkxd: what do you mean? | 14:30 |
| dreamkxd | because at some time, and because the dirty part of svn, some one like to copy the full project B as an subdirectory of project A. | 14:30 |
| dreamkxd | so when convert, we should exclude project B when converting project A. | 14:31 |
| jelmer | dreamkxd: that makes it impossible to create sensible revision ids | 14:31 |
| dreamkxd | That means /ProjetA/branches/ProjectA/ProjectBForEasyBuild copy from /ProjectB | 14:32 |
| dreamkxd | no, I need only one thing, that's ignore all files under directory /ProjetA/branches/ProjectA/ProjectB | 14:32 |
| dreamkxd | we won't create rev id for projectB, because it's virtual, won't convert when we converting ProjectA | 14:33 |
| jelmer | dreamkxd: sorry, but that means we change the contents of an existing revision (because we delete data from there) | 14:35 |
| jelmer | dreamkxd: and that requires a format bump | 14:35 |
| jelmer | dreamkxd: this would also be an issue for svn users of ProjectA | 14:36 |
| jelmer | so is that really all that common? | 14:36 |
| dreamkxd | common? | 14:36 |
| dreamkxd | do you means that the data from bzr on an path is different from svn's path? | 14:37 |
| jelmer | dreamkxd: that too | 14:39 |
| dreamkxd | that's means the bzr's branch /ProjetA/branches/ProjectA/ 's content is different to svn's /ProjetA/branches/ProjectA/ path? because ProjectB is removed from bzr? but bzr still have? | 14:39 |
| dreamkxd | So what's they other problems? That will affecting bzr-svn's codebase a lot? | 14:39 |
| jelmer | dreamkxd: I think this should be entirely different of your autolayout work, it's a lot larger project (and I don't think it's a good idea) | 14:40 |
| dreamkxd | Er... | 14:41 |
| jelmer | dreamkxd: you can't simply change what data bzr-svn imports for a particular revision-id; excluding a directory that older versions of bzr-svn do import will break. | 14:42 |
| jelmer | dreamkxd: this is wholly different from layouts | 14:42 |
| jelmer | dreamkxd: unless I'm misunderstanding what you're proposing | 14:42 |
| dreamkxd | well, may patch won't affecting other layout's work. | 14:42 |
| dreamkxd | I means, there current layout works as-is. | 14:43 |
| dreamkxd | and only when using layout auto, we handle such a conflict. | 14:43 |
| jelmer | dreamkxd: the layouts don't have any influence on the revision-id; the revision-id depends just on the repository UUID, revnum and path | 14:44 |
| jelmer | dreamkxd: your layout can't adjust history, it can only help in what primary paths get imported as a branch | 14:44 |
| dreamkxd | adjust history? what's that means? | 14:45 |
| jelmer | dreamkxd: if you'd like to support multiple branches for a single path (e.g. interpreting both /branches/branchA and /branches/branchA/branchB as a branch) that should mostly be a matter of patching RepositoryLayout.parse() to return multiple results rather than just one | 14:46 |
| jelmer | dreamkxd: however, even if you do that and somebody does "bzr branch <url>/branches/branchA" they will get a branchA bzr branch that has a "branchB" directory in it. | 14:46 |
| jelmer | dreamkxd: does that make sense? | 14:47 |
| dreamkxd | Er.. That's doesn't make sense. | 14:48 |
| dreamkxd | except the orginal branchB and /branches/branchA is the same. | 14:48 |
| dreamkxd | But that's almost impossible. | 14:49 |
| jelmer | dreamkxd: Sorry, I'm having a really hard time understanding what you're saying. | 14:50 |
| dreamkxd | orginal of( branchB and /branches/branchA ) | 14:50 |
| dreamkxd | i means /prefix/branches/branchA copied form /prefix/trunk, and /prefix/branches/branchA/branchB both copied from /prefix/trunk. | 14:50 |
| jelmer | in that case, "branchB" would still be a directory if you check out "/prefix/branches/branchA" | 14:51 |
| dreamkxd | so bzr branch <url>/branches/branchA checkout withou direcotry "branchB" at most case. | 14:52 |
| dreamkxd | yes, that's right. | 14:52 |
| jelmer | dreamkxd: it will checkout *with* branchB | 14:52 |
| dreamkxd | it possible checkout *with* branchB | 14:53 |
| dreamkxd | and the possiblity of possible is very low. in most case, it's not. | 14:53 |
| jelmer | no, it will always checkout with branchB. If you want to make the presence of branchB optional, you should work on per-file ghost support in bzr core first. | 14:53 |
| dreamkxd | do you means geting directory branchB as an ghost, then the problem will be resolved? | 14:54 |
| jelmer | dreamkxd: a ghost is basically something that bzr knows about but doesn't existing the repository | 14:55 |
| jelmer | dreamkxd: a ghost is basically something that bzr knows about but which it does not actually have | 14:55 |
| dreamkxd | indeed, i have no knowledge about ghost at all. | 14:55 |
| jelmer | dreamkxd: it currently supports ghost revisions (e.g. holes in the revision graph) and in principle there are ghost files as well, though they aren't really supported at the moment. | 14:55 |
| dreamkxd | So where to start? I means in the current codebase? | 14:57 |
| jelmer | dreamxkd: in bzr-core. It would probably be very hard to implement them, but it's the right place to do it. | 14:57 |
| jelmer | dreamkxd: It also will be hard to implement what you're proposing in bzr-svn, especially considering performance. | 14:58 |
| dreamkxd | not in bzr-svn? | 14:58 |
| jelmer | dreamkxd: well, it would require support from bzr-svn too, but that's a fraction of the work required in bzr. | 14:59 |
| dreamkxd | I have to say, it's makes me afraid. | 14:59 |
| dreamkxd | well, i have a simple hack to avoid this problem, just directly ignore branchA, getting it to be death, even lost some data, but at least it works. | 15:00 |
| dreamkxd | btw, didn't bzr ghost works like svn-externals? | 15:02 |
| jelmer | dreamkxd: getting to directly ignore branch*B* you mean? | 15:05 |
| jelmer | dreamkxd: ghosts are different from externals; svn-externals are a lot like bzr nested trees. | 15:06 |
| jelmer | although I guess in some regard ghosts can be seen as absent by-value nested trees | 15:06 |
| jelmer | svn-externals are like by-reference nested trees | 15:06 |
| dreamkxd | no, I means ignore branchA. | 15:07 |
| dreamkxd | only perserve the last(tailing) one, so that's didn't need to ignore it's subdirectories. | 15:09 |
| dreamkxd | for example /branches/branchA/branchB. | 15:09 |
| dreamkxd | we won't create /branches/branchA, but branchB. | 15:09 |
| jelmer | ah, ok. fair enough | 15:10 |
| dreamkxd | I meet antoher problem under bzr-svn, when an branch X exist before, but then it's deleted, it won't be converted by bzr-svn, am I right? | 15:15 |
| jelmer | dreamkxd: if you're referring to "bzr svn-import", it will only be converted if you specify --all | 15:17 |
| dreamkxd | Ok. I see it. | 15:18 |
| === jelmer_ is now known as jelmer__ | ||
| === beuno is now known as beuno-lunch | ||
| === beuno-lunch is now known as beuno | ||
| Noldorin_ | hi jelmer | 18:00 |
| jelmer | hi Noldorin_ | 18:01 |
| Noldorin_ | jelmer, so i'm going to check into the issue now a bit :-) | 18:01 |
| Noldorin_ | jelmer, pushin r46 indeed works... btw how can i dpush to another remote branch? | 18:01 |
| jelmer | Noldorin_: how do you mean? | 18:07 |
| jelmer | Noldorin_: fwiw, you can also push to a local git repo | 18:07 |
| jelmer | that might make testing easier | 18:07 |
| Noldorin_ | jelmer, exactly that...what's unclear? | 18:07 |
| Noldorin_ | ok sure | 18:07 |
| jelmer__ | Noldorin: if you want to push to a different branch, just specify a different URL | 18:13 |
| Noldorin_ | jelmer. how exactly does the URL change? | 18:13 |
| jelmer__ | Noldorin_: if you want to push to /tmp/some/repo, use "bzr dpush /tmp/some/repo" | 18:14 |
| Noldorin_ | wel... | 18:14 |
| Noldorin_ | git+ssh://git@github.com/alexreg/ircdotnet.git | 18:14 |
| Noldorin_ | jelmer, that pushes to master branch...how do i change that url for other branches? | 18:15 |
| jelmer | Noldorin_: ah | 18:16 |
| jelmer | Noldorin_: it's not possible to specify colocated branches to push to yet, that's one of the things I'm working on | 18:16 |
| Noldorin_ | jelmer, ah i see... Git/Hg have collocated branches but not Bzr right? | 18:18 |
| Noldorin_ | jelmer, will this feature be ready any time soon? :-) | 18:18 |
| jelmer__ | Noldorin_: There is a plugin that provides it for regular bzr branches (lp:bzr-colo) | 18:19 |
| jelmer__ | The work I'm doing is about adding it to the core, so it can also be used for other things like the bzr-hg and bzr-git plugins | 18:19 |
| jelmer__ | 20:19 <jelmer__> Noldorin_: There is a plugin that provides it for regular bzr branches (lp:bzr-colo) | 18:19 |
| Noldorin__ | jelmer, ah ok. do let me know when it's implemented please! | 18:21 |
| jelmer__ | Noldorin_: Subscribe to bug #380871 | 18:22 |
| ubot5 | Launchpad bug 380871 in Bazaar "support for colocated branches" [High,In progress] https://launchpad.net/bugs/380871 | 18:22 |
| Noldorin__ | jelmer, thanks | 18:23 |
| Noldorin__ | jelmer, it says fix released for bzr-git? | 18:25 |
| Noldorin__ | hmm oh well | 18:28 |
| jelmer | Noldorin__: the required fixes for bzr-git have happened, but that doesn't really matter until the bzr part is there | 18:32 |
| Noldorin__ | jelmer, got it. | 18:33 |
| Noldorin__ | cheers | 18:33 |
| Noldorin__ | brb | 18:33 |
| Kraln | what bug tracking software integrates the best with bzr? :) | 19:00 |
| jelmer__ | Kraln: Probably Launchpad | 19:15 |
| Kraln | probably; what about self-hosted stuff | 19:17 |
| jelmer | Kraln: I'm not sure; I know there is e.g. sloecode, I don't know if that does bug tracking though | 19:22 |
| jelmer | Kraln: things like trac also have plugins that add bzr support | 19:22 |
| * jelmer__ realizes he doesn't actually have a lot of useful info | 19:26 | |
| jelmer__ | sorry | 19:26 |
| === yofel_ is now known as yofel | ||
| maxb | What does 'lost connection during test' mean? | 21:18 |
| maxb | https://launchpadlibrarian.net/76377611/buildlog_ubuntu-natty-i386.bzr-svn_1.1.0~bzr3767-1~bazaar1~natty1_FAILEDTOBUILD.txt.gz | 21:18 |
| jelmer__ | maxb: it's a subunit error | 21:28 |
| jelmer__ | basically, it can mean various different things - in this case I suspect it means that the test runner crashed | 21:29 |
| maxb | worth retrying the build to see if it goes away? | 21:29 |
| jelmer__ | Is this using the latest subvertpy, 0.8.0 ? | 21:29 |
| maxb | 0.8.3 | 21:30 |
| jelmer__ | There were some ref counting issues in subvertpy fixed a while ago that were causing segfaults during the bzr-svn testsuite | 21:30 |
| jelmer__ | in that case, it's probably a new one :( | 21:31 |
| poolie | hi all | 22:17 |
| jelmer | g'morning poolie | 22:18 |
| jelmer | how are you today? | 22:18 |
| poolie | hi, welcome back | 22:18 |
| poolie | good thanks | 22:18 |
| poolie | going to do some reviews and piloting today | 22:18 |
| poolie | my own queue is almost empty which is good | 22:18 |
| jelmer | thanks, it's good to be back.. though I think I got quite a bit of stuff done last week too :) | 22:18 |
| jelmer | poolie: thanks, I'll make sure to have a look at your MPs | 22:19 |
| poolie | thanks, welcome back | 22:20 |
| systemclient | how can I split my ./debian folder into a separate branch and move it out of the repository into a completely differnet folder? | 23:51 |
| jelmer | systemclient: bzr split in your debian directory will create a separate branch | 23:57 |
| jelmer | systemclient: after you commit that, you can safely "bzr branch /path/to/thefolder/debian /tmp/newlocation" | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!