<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
<title></title>
</head>
<body bgcolor="#ffffff" text="#000000">
Patrick R. Michaud wrote:
<blockquote cite="mid20050311161138.GE15500@pmichaud.com" type="cite">
<pre wrap="">On Thu, Mar 10, 2005 at 06:43:04AM +0100, Philippe Krait wrote:
</pre>
<blockquote type="cite">
<pre wrap=""> Hello,
I have hit a really big problem with the preview button. When there are
simultaneous edits and saves, pmwiki does its best to combine the texts,
and that's fine. But when you start editing the text and someone edits it
after you, and you use the "preview button", you get the following
message:
The page you are editing has been modified since you started editing it.
The modifications have been merged into the text below, you may want to
verify the results of the merge before pressing save. Conflicts the system
couldn't resolve are bracketed by <<<<<<< and >>>>>>>. (View changes)
But the "text below" DOES NOT EXIST! The editing box is desperately empty
every time...
</pre>
</blockquote>
<pre wrap=""><!---->
What server OS are you running on? If it's Windows, it's likely
that PmWiki is unable to find the 'diff3' program that is needed to
perform the merge. I thought that I had written PmWiki to be able
to handle the case where merge wasn't available in the OS, but I don't
have an easy way to test this (all of my servers are unix-based).
</pre>
</blockquote>
Thanks for your reply and yes, I'm running under windows.<br>
<blockquote cite="mid20050311161138.GE15500@pmichaud.com" type="cite">
<blockquote type="cite">
<pre wrap=""> This is very easy to reproduce. Take the sand box, open it with two
browser windows. Click edit in window 1. Click edit in window 2. Make a
change in window 2. Save in Window 2. Not click preview in window 1.
Voila...
</pre>
</blockquote>
<pre wrap=""><!---->
Can you reproduce it on pmwiki.org?
</pre>
</blockquote>
No, you're right, it works perfectly under pmwiki.org, I did not think
about testing it there.<br>
<br>
By looking at the code, I have found a PHPdiff function, as well as
merge and mergesimuledits functions , but the code there is a bit deep
for me. I can certainly help you test it, but I don;t know how to
correct it...<br>
<br>
Cheers,<br>
<br>
Philippe<br>
<br>
<br>
</body>
</html>