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

The merge message, when two users edit the same topic, should be cleaned up.

1. PARAM 2 is wrong as sub stringify within User.pm returns: $this->{login}/$this->{web}.$this->{wikiname}

which results in: Main.UserName/Main.UserName

2. There is no regular way to continue except showing the differences of the merge. At least there should be a way to simply go to the topic view.

-- AU

Nr. 2 seems to be a general issue. Most messages miss the [OK] button to go back to the topic. (Although there are messages where there should not be an [OK] button to let users go back to the previous screen.)

-- PTh

In interest of getting eventual conflicts resolved asap, I think a link to diffs is the best link to offer under all circumstances.

Regarding missing OK buttons, TestCaseOopsAttention / Alerts has a list of user messages, feel free to create proper patches smile

-- SP

OK button added to merge_notice.

SVN 8649.

-- SP

ok, number 1 just looks odd because you are using WikiName as usename, and because I suspect that stringify was not really intended to be called when the user sees it. I'm not going to change the code now :()

-- SD

To solve (2) there should be called another Method, so that the user sees the right name.

-- AU

SVN 8995.

-- SP

merged in 9214

-- RA

Closed with release of 4.0.2

KJL

ItemTemplate
Summary Clean up "oops attention: merge_notice"
ReportedBy TWiki:Main.AndreUlrich
Codebase

SVN Range Sun, 29 Jan 2006 build 8586
AppliesTo Engine
Component

Priority Normal
CurrentState Closed
WaitingFor

Checkins 8649 8995 9213 9214
TargetRelease patch
Edit | Attach | Watch | Print version | History: r13 < r12 < r11 < r10 < r9 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r13 - 2006-04-01 - KennethLavrsen
 
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