[Erp5-report] r29822 - /erp5/trunk/products/ERP5/interfaces/versionable.py

[nobody at svn.erp5.org]

Author: jp
Date: Mon Oct 19 20:22:20 2009
New Revision: 29822

URL: http://svn.erp5.org?rev=29822&view=rev
Log:
Updated docstring of mergeRevision

Modified:
    erp5/trunk/products/ERP5/interfaces/versionable.py

Modified: erp5/trunk/products/ERP5/interfaces/versionable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/interfaces/versionable.py?rev=29822&r1=29821&r2=29822&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/interfaces/versionable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/interfaces/versionable.py [utf8] Mon Oct 19 20:22:20 2009
@@ -88,5 +88,6 @@
     Merge the current document with any previous revision
     by using the content of the current document to replace
     the content of previous revisions, and by deleting the
-    current document afterwards.
+    current document afterwards. Returns the resulting
+    document of the merge process.
     """