[Erp5-report] r44045 jm - in /erp5/trunk/products: ERP5/Document/ ERP5VCS/

[nobody at svn.erp5.org]

Author: jm
Date: Tue Mar  8 11:50:58 2011
New Revision: 44045

URL: http://svn.erp5.org?rev=44045&view=rev
Log:
Increase BT revision according to upstream revision, if possible

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py
    erp5/trunk/products/ERP5VCS/WorkingCopy.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=44045&r1=44044&r2=44045&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Tue Mar  8 11:50:58 2011
@@ -4567,7 +4567,10 @@ Business Template is a set of definition
       # Make sure that everything is sane.
       self.clean()
 
-      self.updateRevisionNumber()
+      try:
+        self.setRevision(self.getVcsTool().newRevision())
+      except NotAWorkingCopyError:
+        self.updateRevisionNumber()
       self._setTemplateFormatVersion(1)
       self.storeTemplateItemData()
 

Modified: erp5/trunk/products/ERP5VCS/WorkingCopy.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5VCS/WorkingCopy.py?rev=44045&r1=44044&r2=44045&view=diff
==============================================================================
--- erp5/trunk/products/ERP5VCS/WorkingCopy.py [utf8] (original)
+++ erp5/trunk/products/ERP5VCS/WorkingCopy.py [utf8] Tue Mar  8 11:50:58 2011
@@ -200,6 +200,7 @@ class WorkingCopy(Implicit):
       file.write(str(revision))
     finally:
       file.close()
+    return revision
 
   def getLastChangelog(self):
     """Return last changelog of a business template