Item1581: Conflict resolution/detection/history failed

pencil
Priority: Urgent
Current State: No Action Required
Released In:
Target Release: n/a
Applies To: Engine
Component: Conflict Resolution
Branches:
Reported By: MarkWhitis
Waiting For:
Last Change By: KennethLavrsen
foswiki failed 1) Conflict Detection, 2) Conflict Resolution, 3) History

I was attempting to test the usability of the conflict resolution features.

This bug exists in whatever version you are using on the website (which you don't bother to tell us somewhere we can easily find it, like on the about page or on this bug form).

that information is available at the top of System.WebHome. but i think that the about page is a great place to have that information, too, so i have added it there.

-- WillNorris - 06 May 2009

  • Create new autonumbered sandbox page
  • Edit
  • Create an unnumbered list with junk, something like this:

  • sadf asdf asdf dsaff d sda fd sad fd df adsfasdfasdf fdsas fasdfsdfasadf a sdfasdfasd
  • sadfasdf asdf asdfasdf asdf asd fasd fasd asf asd sfasd asd fas dfasd fas df
  • asdfasd fasdf asdf adf asdf asd fas dfa sdf asdf af dasd fasdfas df asdfas dfasd fsdfa
  • sadfas dfasd fasd dfas df asdfasdl;asjk;ljsadf sdfkas;dfja;sfj sadfjk;asldf;ajsdlkfa
  • asdljfka;sdja sdl;asdfklsdaf sda dsfk ;ajfds;adkjf;kdsjdjf;asdjfsladkjfafjdsajkfdajkdf
  • sadfasdfads fas dfsdafafkasf sadf dsfd asdf asd fdasd fsadfasdfasdf asdf asdf asdfdsfadf asdf sdf as dfsf sdj adfs dasf dsaf df dsaf sdfds a df sdf a dsf dfssdf asdf asdfasdjf;asdjf;lsadjf;sakdjf;ksdlkjfaskjfasdljfjad

  • Save
  • Open a new browser tab, copy the URL so you now have two tabs pointing to the same page
  • Click edit in both tabs
  • In tab#1, delete a few words from line 3, then add "I added this text in Window 1" to the end of the line.
  • In tab#2, delete a few different words from line 3, then add "This text added in Window2" to the end of the line
  • Click save in tab #1
  • Click save in tab #2 - This should have triggered conflict resolution
  • Both windows now show the text added in that window
  • Open the page in a third tab to see what is really there.
  • All changes made in tab #1 were lost
  • Look at history, there is no record of tab #1 changes. Revision 0 (original edit) is not shown, Revision 1 (tab #1 changes) is missing, and revision 2 is called revision 1. The revision shown improperly indicates where the changes occurred, it puts change marks next to lines 1 and 2 instead of line 3. It doesn't give universal diff format or html ins/del tag format for the changes.
  • Search for Conflict Resolution in wiki. Only two matches: WikiMatrix and release notes/changelog. Both say the program has conflict resolution.

But there is no actual documentation on conflict resolution which contains the term "conflict resolution".

This was done in http://foswiki.org/Sandbox/TestTopic34

Tagged as urgent because this can result in substantial loss of work without even giving any warning.

Comments:

Repeated test in my user page in case conflict resolution was turned off on sandbox. Similar results. -- MarkWhitis - 06 May 2009

On a related note, the history of this bug report is also displayed incorrectly. It does not show the addition of the prior comment as a change and flags lines 1&2 as changed (they weren't). -- MarkWhitis - 06 May 2009

Addition of the second comment did not create a new history revision. Apparently the addition of the first one didn't either. It appears the revision system only created a revision for the initial creation and in the different history views under more topic actions, it appears to thing the entire page is two lines. -- MarkWhitis - 06 May 2009

The report above indicates that you are opening two tabs in the same browser and we can assume you are the same user in the two windows.

So what you do is

  • You view the same topic in the two tabs
  • You edit the same topic in the two webs
  • You save something in one tab as yourself
  • Your topic is now saved but the other windows has no clue about that. It is just a dumn browser window.
  • You now save in the other window. There is no way the server can know that you did not intend to save exactly what is in the edit window.

You are the same person using the same browser that has the same session. Things work exactly like they shoud.

The conflict resolution requires that two different users edit at the same time.

You can try it by having two user accounts. And then edit the topic with one user login in for example Internet Explorer and as another user in Firefox. Foswiki will now see it as to different users and it will catch the conflict and show them with ins and del html tags.

Also you do not get a new revision unless you ask for it. Foswiki will - as a nice feature - allow people to save many times why they write and correct without creating a new revision each time. You can force a new revision (little checkmark in the edit window). A new revision is created if you force it, or edit again after one hour since last save (this time is configurable) or the save is happening by another person than the one saving the previous version. Very useful and smart feature.

No action required.

-- KennethLavrsen - 06 May 2009

ItemTemplate edit

Summary Conflict resolution/detection/history failed
ReportedBy MarkWhitis
Codebase 1.0.5 beta1
SVN Range Foswiki-1.0.0, Thu, 08 Jan 2009, build 1878
AppliesTo Engine
Component Conflict Resolution
Priority Urgent
CurrentState No Action Required
WaitingFor
Checkins
TargetRelease n/a
ReleasedIn
Topic revision: r3 - 06 May 2009, KennethLavrsen
The copyright of the content on this website is held by the contributing authors, except where stated elsewhere. See Copyright Statement. Creative Commons License    Legal Imprint    Privacy Policy