branches, bugs, and landings for 2.0 and beyond

[Martin Pool]

2009/9/11 John Arbash Meinel <john at arbash-meinel.com>:
> If we are going to do this, then I propose this patch for bzr:
>
> === modified file 'bzrlib/__init__.py'
> - --- bzrlib/__init__.py  2009-08-30 21:34:42 +0000
> +++ bzrlib/__init__.py  2009-09-10 15:42:01 +0000
> @@ -81,7 +81,7 @@
>     ...
>     ValueError: version_info (1, 4, 0, 'wibble', 0) not valid
>     """
> - -    if len(version_info) == 2 or version_info[2] == 0:
> +    if len(version_info) == 2:
>         main_version = '%d.%d' % version_info[:2]
>     else:
>         main_version = '%d.%d.%d' % version_info[:3]
>
> This changes 'bzr --version' to print:
>  bzr 2.1.0dev
>
> rather than
>  bzr 2.1dev
>
> It also will tell my win32 build script to build:
>  bzr-2.0.0rc2
>
> Rather than
>  bzr-2.0rc2
>
> Thoughts?

Yes, that's what I was thinking too.  +1.  We should also update the cycle doc.

-- 
Martin <http://launchpad.net/~mbp/>