Rev 2865: separate word (dev/candidate) in version info with dots in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2865
revision-id: pqm at pqm.ubuntu.com-20070925205148-yd27v1odc65uql59
parent: pqm at pqm.ubuntu.com-20070925201921-vjahqpm8bfx6bbvn
parent: bialix at ukr.net-20070925193251-tyn89934php66ney
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-25 21:51:48 +0100
message:
  separate word (dev/candidate) in version info with dots
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 2862.1.1
    merged: bialix at ukr.net-20070925193251-tyn89934php66ney
    parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
    parent: bialix at ukr.net-20070913093037-n8bp84n8kcifkvqu
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: dotted.version.info
    timestamp: Tue 2007-09-25 22:32:51 +0300
    message:
      merge with bzr.dev
    ------------------------------------------------------------
    revno: 2814.3.1
    merged: bialix at ukr.net-20070913093037-n8bp84n8kcifkvqu
    parent: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: dotted.version
    timestamp: Thu 2007-09-13 12:30:37 +0300
    message:
      separate word (dev/candidate) in version info with dots
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2007-09-12 01:29:21 +0000
+++ b/bzrlib/__init__.py	2007-09-25 19:32:51 +0000
@@ -43,7 +43,7 @@
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]
 else:
-    version_string = '%d.%d.%d%s%d' % version_info
+    version_string = '%d.%d.%d.%s.%d' % version_info
 __version__ = version_string
 
 # allow bzrlib plugins to be imported.