Modify Edit Conflict markup to show user and be optionally less intrusive
The current moinmoin (1.8.3) already does fairly well coping with multiple simultaneous editors on the same page using the diff3 algorithm, but in the absence of a mob edit feature, a simple change would make it easier to work in this environment.
- 1 Just add the username to the message
Edit conflict - your version: -->> Edit conflict - BoydBlackwell version:
- 2 make the conflict message a comment so it can be turned off or changed into something less intrusive - e.g.
old text
....... (bdb changes)
new text
....... (end bdb changes)
other old text
This (2) could be controlled by a two element format string in the configuration class that determined how much of the message went into the comment and how much (if any) was outside (and therefore visible with comments off). (I have partially implemented the comment bit in my example on this page (statically) - turn comments on!)
The fancy diff facility in MoinMoin RecentChanges provides a similar (much better ) functionality for single user edits, but I am not looking to replace this - just to make working in a multiple edit (mob edit) environment easier.
(ps: I can hack this if someone gives me a pointer to determining the username within /wiki/moin-1.8.3/MoinMoin/PageEditor.py)