changeset 1139:213b244cdf4f

Renamed mergeChanges to mergeDiff.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Mon, 07 Aug 2006 21:50:29 +0200
parents 2617803641be
children 3155f908de85
files MoinMoin/xmlrpc/__init__.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/xmlrpc/__init__.py	Mon Aug 07 18:49:11 2006 +0200
+++ b/MoinMoin/xmlrpc/__init__.py	Mon Aug 07 21:50:29 2006 +0200
@@ -617,7 +617,7 @@
         else:
             return [self._outstr(name), iwid]
 
-    def xmlrpc_mergeChanges(self, pagename, diff, local_rev, delta_remote_rev, last_remote_rev, interwiki_name):
+    def xmlrpc_mergeDiff(self, pagename, diff, local_rev, delta_remote_rev, last_remote_rev, interwiki_name):
         """ Merges a diff sent by the remote machine and returns the number of the new revision.
             Additionally, this method tags the new revision.
             
@@ -634,7 +634,7 @@
 
         pagename = self._instr(pagename)
 
-        comment = u"Remote - %r" % interwiki_name
+        comment = u"Remote Merge - %r" % interwiki_name
         
         # User may read page?
         if not self.request.user.may.read(pagename) or not self.request.user.may.write(pagename):