• Do not register here on develop.twiki.org, login with your twiki.org account.
• Use View topic Item7700 for generic doc work for TWiki-6.0.2. Use View topic Item7703 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 fix for Item1897 has introduced a new serious bug.

The merge itself duplicates a lot of the content screwing up the topic completely.

Also. The reported saved version number when the merging user saves is still one behind.

The merge error is so seriously affecting the use that I classify it as requirement.

The test case is the good old Aedit Asave Bedit Aedit Asave Bsave

But each time I actually write something in the topic. I start with a topic with some text. And then I make A write above the old text and B write below the old text so in principle the merge should be easy and perfect.

But when you go back to the A and reload the page a lot of the text is duplicated.

KJL

Was caused by an unintentional paste.

SVN 9417

CC

Closed with release of 4.0.2

KJL

ItemTemplate
Summary Merging 3part duplicates the text screwing up the page
ReportedBy TWiki:Main.KennethLavrsen
Codebase

SVN Range Mon, 13 Mar 2006 build 9258
AppliesTo Engine
Component

Priority Urgent
CurrentState Closed
WaitingFor

Checkins 10172 11161 11163 9417
TargetRelease patch
Edit | Attach | Watch | Print version | History: r10 < r9 < r8 < r7 < r6 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r10 - 2006-05-13 - CrawfordCurrie
 
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