changeset 1253:9721b9e2a074

Use the new diff3 mode in SyncPages. Updated my CHANGES file.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Wed, 09 Aug 2006 18:32:59 +0200
parents e92c75fa13a9
children 7686daa0249c
files MoinMoin/action/SyncPages.py docs/CHANGES.aschremmer
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/SyncPages.py	Wed Aug 09 18:31:11 2006 +0200
+++ b/MoinMoin/action/SyncPages.py	Wed Aug 09 18:32:59 2006 +0200
@@ -456,7 +456,7 @@
             old_contents = old_contents.encode("utf-8")
 
             # here, the actual merge happens
-            verynewtext = diff3.text_merge(old_contents, new_contents, current_page.get_raw_body(), 1, *conflict_markers)
+            verynewtext = diff3.text_merge(old_contents, new_contents, current_page.get_raw_body(), 2, *conflict_markers)
 
             new_local_rev = current_rev + 1 # XXX commit first?
             local_full_iwid = packLine([local.get_iwid(), local.get_interwiki_name()])
--- a/docs/CHANGES.aschremmer	Wed Aug 09 18:31:11 2006 +0200
+++ b/docs/CHANGES.aschremmer	Wed Aug 09 18:32:59 2006 +0200
@@ -31,6 +31,9 @@
       no system pages etc.)
     * IWID support - i.e. every instance has a unique ID
     * InterWiki page editable in the wiki, modification detection based on mtimes
+    * SyncPages action
+    * XMLRPC functions may return Fault instances
+    * diff3 algorithm extenteded, a new mode should reduce the conflicts
 
   Bugfixes (only stuff that is buggy in moin/1.6 main branch):
     * Conflict resolution fixes. (merged into main)
@@ -90,7 +93,8 @@
 Week 32: Continued work on the merge logic, finished prefix handling. Added local conflict
          detection in SyncPages. Added logging support to SyncPages. Refactored conflict flag
          detection from the edit action into the PageEditor class. Enhanced XMLRPC server in Moin to allow
-         XMLRPC functions to return Fault instances.
+         XMLRPC functions to return Fault instances. Introduced a new diff3 mode that should reduce the
+         conflicts.
 
 2006-07-18: the requested daily entry is missing here, see http://moinmoin.wikiwikiweb.de/GoogleSoc2006/BetterProgress
 2006-07-19: the requested daily entry is missing here, see http://moinmoin.wikiwikiweb.de/GoogleSoc2006/BetterProgress