[pmwiki-users] phpmerge.php doesn't detect removed paragraph as a conflicting change
jens.schiffler at gmx.de
Thu Nov 30 18:12:16 CST 2006
phpmerge.php has not proven reliable when testing concurrent edits with 2.1.11
and 2.2.0-beta16 on a windows 2003 Server with IIS.
As suggested by PM I tested it using two browser windows.
1. start the first ("outer") edit, alter first paragraph
2. start the second ("inner") edit, remove a line of text, alter second
3. save changes in second "inner" edit window
4. save changes in first "outer" edit window
"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 >>>>>>>"
But a line removed by the "inner" edit is not shown as a conflicting change.
It's just missing.
The changes to paragraphs seem to be merged without a problem.
More information about the pmwiki-users