Foswiki on GitHub is open for business! Next release meeting: Monday Dec. 1, 1300Z

Item9844: Merge feature no longer working

Priority: CurrentState: AppliesTo: Component: WaitingFor:
Urgent Closed Engine    
In Foswiki 1.1 the merge feature is broken. It does not work at all.

You have user A and B.

  • A edits
  • B edits and see the warning and edits anyway
  • B saves after having edited some of the same text A is editing.
  • A saves

No conflict. A just overwrites and reverts all B did.

  • A edit
  • B edits and see the warning and edits anyway
  • A saves after having edited some of the same text B is editing.
  • B saves

No conflict warning. B just overwrites and reverts all A has done.

This is a release blocker and urgent for 1.1.1

-- KennethLavrsen - 19 Oct 2010

It was due to validation of rev= parameters. trunk patch:
Index: Edit.pm
===================================================================
--- Edit.pm   (revision 9552)
+++ Edit.pm   (working copy)
@@ -62,7 +62,8 @@
       || 'text/html';
     my $parentTopic = $query->param('topicparent') || '';
     my $ptext       = $query->param('text');
-    my $revision    = Foswiki::Store::cleanUpRevID( $query->param('rev') );
+    my $revision    = $query->param('rev');
+    $revision = Foswiki::Store::cleanUpRevID($revision) if defined $revision;
 
     Foswiki::UI::checkWebExists( $session, $web, 'edit' );

Please test! It works for me, but then, it did when I checked in the first time.

-- CrawfordCurrie - 19 Oct 2010

Works fine.

I have checked in fix on both trunk and R11

-- KennethLavrsen - 19 Oct 2010
 

ItemTemplate edit

Summary Merge feature no longer working
ReportedBy KennethLavrsen
Codebase 1.1.0
SVN Range
AppliesTo Engine
Component
Priority Urgent
CurrentState Closed
WaitingFor
Checkins distro:1ed010430960 distro:76dad551ddf6
TargetRelease patch
ReleasedIn 1.1.1
Topic revision: r6 - 25 Oct 2010, KennethLavrsen
 
The copyright of the content on this website is held by the contributing authors, except where stated elsewhere. see CopyrightStatement. Creative Commons License