[Pmwiki-users] Edit / Lock Pages

[Christian Ridderström]

On Tue, 27 Jan 2004, Patrick R. Michaud wrote:

> On Wed, Jan 28, 2004 at 02:08:58AM +0100, Christian Ridderstr?m wrote:
> > On Tue, 27 Jan 2004, Patrick R. Michaud wrote:
> > 
> > > Yes, this part is easy--it's conflict detection.  The real question is, 
> > > what should happen once a conflict has been detected?
> 
> After thinking about it this afternoon, I'm thinking that whenever
> a conflict is detected (either because the user pressed "Save" or "Preview"),
> the user is returned to the edit form with a message warning that someone
> else has changed the page during the edit session, along with options to 
>
>   (1) Open another window displaying the changes made to the saved page
>       since the beginning of the edit session,

That's a good alternative.

>   (2) Abandon the edits made thus far and start editing again with the
>       latest saved version of the page,

Also good.

>   (3) Go ahead and overwrite the page with the current contents.

I don't think we should allow #3 *unless* the author first has looked 
at #1. Maybe not unless they pressed a button like "discard first authors 
changes".

> I figure this will allow someone to quickly look to see what other changes
> were made (via #1), and decide if they want to merge the saved changes 
> into their current edit session and save them (#3) or revert to the 
> newly saved page (#2) and add their edits to that one.  

Btw, what about an alternative that automatically merges the changes and 
shows that to the author?  IMO, this should be the default behaviour if 
there aren't any conflicts.

Actually, since wiki is supposed to be about collaborating, we should make 
it easy for people to work concurrently on the same page.

/Christian

PS. In the end, we (or rather I) will have to figure out a solution for 
pmwiki-mode in Emacs as well. (and pmwe I guess).

Right now, I have about 20 wiki pages open in Emacs, and since I just 
suspend my laptop, they pages have been there for days. So the risk is 
much greater in this case that someone else might have modified a page, 
and I forget to reload it before saving it.

-- 
http://www.md.kth.se/~chr