I'd just like to drop in with info, that `pmwiki-mode' will have 3-way graphical merge for edits. It will just pass the job to emerge of course (its local copy of the original, the changed version, and current version from server), so its only a matter of "function call" I hope. Sorry I don't have time now but I plan to implement this kind of feature this weekend. State your requirements and help us test it. (Disclaimer: `pmwiki-mode' still has many bugs now, but nevertheless should be a nice experience, use the CVS version from sourceforge. It doesn't provide conflict recognition yet, I'll work on it this weekend.)
On 2/28/07, Leo Razoumov <[EMAIL PROTECTED]> wrote: > Hi Everybody, > I have a pmwiki installation on a Linux server behind a firewall for a > small group of people with a busy travel schedule. When on the road a > local offline copy of wiki is used by those individuals. When a person > is back merging her/his changes to the master wiki tree is a difficult > procedure for the pages with conflicting changes. > A graphical 3-way merge like WinMerge or Emacs emerge would be a great help. > Among wiki engines I think MoinMoin is the only one that allows to > merge wiki versions this way. But I like pmwiki a lot (have been using > it for the last two years) and I hope wiki synchronization and page > merging could be implemented in pmwiki before too long. This will > clearly set pmwiki ahead of competition. > > --Leo-- > > _______________________________________________ > pmwiki-users mailing list > pmwiki-users@pmichaud.com > http://www.pmichaud.com/mailman/listinfo/pmwiki-users > _______________________________________________ pmwiki-users mailing list pmwiki-users@pmichaud.com http://www.pmichaud.com/mailman/listinfo/pmwiki-users
