• Do not register here on develop.twiki.org, login with your twiki.org account.
• Use View topic Item7848 for generic doc work for TWiki-6.1.1. Use View topic Item7851 for doc work on extensions that are not part of a release. More... Close
• Anything you create or change in standard webs (Main, TWiki, Sandbox etc) will be automatically reverted on every SVN update.
Does this site look broken?. Use the LitterTray web for test cases.

Item4803: Missing param messages in merge screen

Item Form Data

AppliesTo: Component: Priority: CurrentState: WaitingFor: TargetRelease ReleasedIn
Engine   Urgent Closed   n/a  

Edit Form Data

Summary:
Reported By:
Codebase:
Applies To:
Component:
Priority:
Current State:
Waiting For:
Target Release:
Released In:
 

Detail

  • Open a browser (browser 1) and create a new topic
  • Add some text
  • Save the topic
  • Edit it again in browser 1, modify the text, but keep the editor open
  • In another browser (browser 2), edit the same topic, but log in as a different user
  • Modify the text to somethingdifferent to the first edit.
  • Save in browser 2
  • Save in browser 1
The merge screen should come up. For me, it looks like this:
Rev 61 was saved by Main.MISSING PARAM2 , while you were still editing.

Those changes have been merged with yours to create Rev MISSING PARAM3 . Text fields will have been merged, but other data such as form fields may have overwritten the other users changes. Please inspect the topic to make sure it is OK, especially if you made any changes to form fields.

You can see the differences MISSING PARAM3 " target="_top">here.


-- TWiki:Main/CrawfordCurrie - 12 Oct 2007

Simple fix.

CC

ItemTemplate
Summary Missing param messages in merge screen
ReportedBy TWiki:Main.CrawfordCurrie
Codebase 4.2.0
SVN Range TWiki-4.3.0, Fri, 12 Oct 2007, build 15237
AppliesTo Engine
Component

Priority Urgent
CurrentState Closed
WaitingFor

Checkins TWikirev:15271 TWikirev:15272
TargetRelease n/a
ReleasedIn

Edit | Attach | Watch | Print version | History: r2 < r1 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r2 - 2007-10-13 - CrawfordCurrie
 
This site is powered by the TWiki collaboration platform Powered by PerlCopyright © 2008-2019 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback