You are here: Foswiki>Tasks Web>Item9946 (05 Jul 2015, GeorgeClark)Edit Attach

Item9946: Topic was merged information links to diff between same revision.

pencil
Priority: Normal
Current State: Closed
Released In: 2.0.0
Target Release: major
Applies To: Engine
Component: FoswikiUIRDiff, FoswikiUISave
Branches: master
Reported By: HenningDampel
Waiting For:
Last Change By: GeorgeClark
Steps to reproduce:

1. Create new Topic and add the Line "Test".

2. Edit the Topic by UserA and UserB at the same time:

2.1 UserA Changes the Line to "Test UserA" and saves the topic

2.2 UserB Changes the Line to "Test UserB" and saves the topic

3. UserB gets the "Topic was merged" information page and has the possibility to click on "Topic history comparison tool (diff)" This link leads to a comparison between Rev 1 and Rev 1, which will show the following:

Line: 1 to 1 Added:

'>

'> 1

I would expect that the differences of both saved revisions are shown.

So this is just a question of what is expected by a user when he/she clicks on this link.

And by the way, the History part of the footer uses the bin/compare tool, whereas this link uses the rdiff tool.

-- HenningDampel - 03 Nov 2010

Confirmed, but Foswiki 1.2 works a bit differently. Starting with Step 3.

UserB gets "Topic was merged" Diff is for Rev 1 & Rev 2. However when screen is "OK'd" it's actually Rev3 that is saved.

Rev 1 was saved by UserA, while you were still editing.

Those changes have been merged with yours to create Rev 2. 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.

Confirm your changes using Foswiki's topic history comparison tool (diff).

OK

So the template message is wrong.

  • Rev 1 was the original topic created by some other user.
  • Rev 2 was saved by UserA
  • Rev 3 was saved by UserB and contains the merge results.

  1. We should probably link to bin/compare, not bin/rdiff
  2. The rev numbers need adjusting.

-- GeorgeClark - 07 Jan 2015

It looks like the save into Rev 3 isn't accounted for in the Foswiki::UI::Save logic. It reports the results of the Foswiki::Merge::merge3() without examining the rev of the saved results of the merge3.

-- GeorgeClark - 07 Jan 2015
 

ItemTemplate edit

Summary Topic was merged information links to diff between same revision.
ReportedBy HenningDampel
Codebase 1.1.1
SVN Range
AppliesTo Engine
Component FoswikiUIRDiff, FoswikiUISave
Priority Normal
CurrentState Closed
WaitingFor
Checkins distro:aad8b839abb3
TargetRelease major
ReleasedIn 2.0.0
CheckinsOnBranches master
trunkCheckins
masterCheckins distro:aad8b839abb3
ItemBranchCheckins
Release01x01Checkins
Topic revision: r5 - 05 Jul 2015, GeorgeClark - This page was cached on 26 Jul 2016 - 04:45.

The copyright of the content on this website is held by the contributing authors, except where stated elsewhere. See Copyright Statement. Creative Commons License