You are here: Foswiki>Tasks Web>Item5553 (12 Jan 2015, GeorgeClark)Edit Attach

Item5553: Topic merge oops message parameters are buggy

pencil
Priority: Normal
Current State: No Action Required
Released In: n/a
Target Release: n/a
Applies To: Engine
Component: Merge
Branches:
Reported By: TWiki:Main.StefanWalter
Waiting For:
Last Change By: GeorgeClark
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

Fixed in a recent task on trunk. Setting to No Action

-- GeorgeClark - 12 Jan 2015

ItemTemplate edit

Summary Topic merge oops message parameters are buggy
ReportedBy TWiki:Main.StefanWalter
Codebase
SVN Range TWiki-5.0.0, Tue, 15 Apr 2008, build 16676
AppliesTo Engine
Component Merge
Priority Normal
CurrentState No Action Required
WaitingFor
Checkins TWikirev:16712 TWikirev:16713
TargetRelease n/a
ReleasedIn n/a
CheckinsOnBranches
trunkCheckins
masterCheckins
ItemBranchCheckins
Release01x01Checkins
I Attachment Action Size Date Who Comment
patch.txttxt patch.txt manage 418 bytes 21 Apr 2008 - 14:00 UnknownUser patch
Topic revision: r6 - 12 Jan 2015, GeorgeClark
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