![]() ![]() ![]() T13:13:41 mvirkkil: in order to do a 3-way merge, you need to have a common ancestor Just looking at a page from A and C, why can't they be merged? Or is the revision history the problem? T13:13:10 I'm sorry but I'm still not sure why. T13:12:05 they dont know about each other T13:11:56 because a and c dont have any information about the common parent that both wikis share T13:09:18 I'm not familiar with the problem why " a wants to merge with c, that wont work" happens? T13:06:09 i am currently evalutating if it is feasible to bring DVCS approaches into the solution now a wants to merge with c, that wont work T13:05:24 mvirkkil: imagine three wikis a,b,c. T13:04:44 xorAxAx: Merging is your main problem? In what way? T13:04:31 that i have been knowing for quite long T13:04:17 my described algorithm has a few deficies T13:04:09 mvirkkil: you know, the merging logic is the key problem T13:04:01 mvirkkil: i can still do it over xmlrpc T13:03:46 not all of it, but some base ideas and a few classes T13:03:45 xorAxAx: What about your xmlrpc approach? T13:03:20 xorAxAx: using mercurial for syncing? T13:03:05 i will upload my newest ideas about using mercurial today T13:02:54 currently i need input on my thoughts And also to mention they'd be interested in (beta)testing your stuff and that I should make sure it integrates with my stuff :) T13:02:21 xorAxAx: My mentor told me to keep tabs on your progress. T12:58:59 xorAxAx: The dapper package this guy built for me was messed up. T10:12:30 mvirkkil: btw, your last commit is 5 days ago. T10:08:12 the item stuff will be the biggest internal change, affecting much other stuff T10:07:06 but xapian, storage/mimetype, wiki sync and your stuff will be the bigger things T10:06:00 as you have seen, I also already did some cleanup in the src T10:05:37 well, when the storage backend / item stuff is done, we need some mimetype handler work T10:04:28 are other large changes going to be targets for 1.6 besides the SoC ones? T10:03:03 ThomasWaldmann: Yeah :) As always. T10:02:54 it will be released when it is ready :) T10:02:52 (and I'm going to do my best to have my code in releasable shape) T10:02:26 ThomasWaldmann: So, I can tell them that 1.6 will be released sometime before next year? T09:33:39 but as you are working on a side branch of 1.6, some 1.6 release is not too far fetched T09:33:08 we still have to see what stuff succeeds in getting releasable Is there any timetable or pre-timetable I could give them? T09:21:43 People are asking me about the 1.6 release (or whatever release which will contain the SoC-projects). T09:13:44 Ok, and i suppose it's ok to just to attach all resources to the created mainpage T09:13:43 there will be a generic up/download function in a toplevel item T09:12:11 when we have mimetype items, that action can be moved there maybe T09:11:49 currently, it has to be an action How should a person upload a complete docbook, and where do I put my code to do the splittin, conversion, and pagecreation? T09:11:02 But the basic UI problem remains. T09:10:09 and if the pages are created as subpages or not will probably need to be a configuration option. ![]() T09:09:22 ThomasWaldmann: Yes, but since one docbook will be split in to multiple pages, with a single mainpage. T09:09:19 with items, they will be like a sub-page, but with different mimetype T09:08:55 Should I make it an action which generates a page with an upload field? T09:08:55 currently attachments are put under a page T09:08:14 But how should they upload them? T09:08:00 And I think I want people to upload their docbook+resources (usually images) as a zip. T09:07:30 basically the docbook->wiki conversion will be done using xslt:s. T09:07:07 How would you recommend I do the docbook+images -> wikipages+images ? T09:04:37 mvirkkil: Kepplar is working on that What timescale are we talking about? Is this going to happen within 1.6? T08:53:09 There was talk about moving away from page attachments, and having atachments be items or something. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |