[pmwiki-users] Burnt! Simultaneous edit lost :-(
Patrick R. Michaud
pmichaud at pobox.com
Fri Mar 3 16:10:39 CST 2006
On Fri, Mar 03, 2006 at 11:01:36PM +0100, Joachim Durchholz wrote:
> Patrick R. Michaud schrieb:
> > PmWiki has supplied its own PHP-based diff utility since version
> > 1.0.11.
> Oh. Then I must have misunderstood something drastically. I dimly
> remember somebody wrote about losing edits if no diff3 utility is available.
"diff3" is not the same as "diff". The page history is generated
using a PHP version of "diff", which computes the difference between
two versions of a page.
Merging of simultaneous edits is performed using "diff3". If both
Alice and Bob simultaneously edit the same page, then "diff3"
uses Alice's copy, Bob's copy, and the original ancestor to produce
a new version of the page that incorporates both Alice and Bob's changes
(or flags places where they conflict).
Computing (and displaying) a page's edit history only requires "diff".
Merging two separate branches of edits together requires "diff3".
More information about the pmwiki-users