• 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.

Item5553: Topic merge oops message parameters are buggy

Item Form Data

AppliesTo: Component: Priority: CurrentState: WaitingFor: TargetRelease ReleasedIn
Engine Merge Normal New   n/a  

Edit Form Data

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

Detail

The parameters PARAM1 to PARAM3 supplied to the merge_notice template in messages.tmpl are wrong in two ways:

  1. PARAM2 contains the login name (in our case the UNIX uname) and not the WikiName of the other user that saved the topic
  2. PARAM1 and PARAM3 are both set to the same revision if the 'workflow' is the following:
  1. User 1 edits topic
  2. User 2 edits same topic and chooses Edit Anyway
  3. User 1 saves his changes which will become rev n
  4. User 2 saves his changes and gets the topic merged oops for rev n to rev n.

The attached patch will resolve the first issue. I could not easily identify a fix for the second issue.

-- TWiki:Main/StefanWalter - 21 Apr 2008

I've applied the patch to 4.2 branch and MAIN - thanks

still need to work on part 2

-- TWiki:Main.SvenDowideit - 22 Apr 2008

ItemTemplate
Summary Topic merge oops message parameters are buggy
ReportedBy TWiki:Main.StefanWalter
Codebase 4.2.0
SVN Range TWiki-5.0.0, Tue, 15 Apr 2008, build 16676
AppliesTo Engine
Component Merge
Priority Normal
CurrentState New
WaitingFor

Checkins TWikirev:16712 TWikirev:16713
TargetRelease n/a
ReleasedIn

Topic attachments
I Attachment History Action Size Date Who Comment
Texttxt patch.txt r1 manage 0.4 K 2008-04-21 - 14:00 StefanWalter patch
Edit | Attach | Watch | Print version | History: r2 < r1 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r2 - 2008-04-22 - SvenDowideit
 
This site is powered by the TWiki collaboration platform Powered by PerlCopyright © 2008-2018 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback