← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
68
68
    >>> print _format_version_tuple((1, 1, 1, 'candidate', 2))
69
69
    1.1.1rc2
70
70
    >>> print bzrlib._format_version_tuple((2, 1, 0, 'beta', 1))
71
 
    2.1.0b1
 
71
    2.1b1
72
72
    >>> print _format_version_tuple((1, 4, 0))
73
73
    1.4.0
74
74
    >>> print _format_version_tuple((1, 4))
100
100
    elif release_type == 'dev':
101
101
        sub_string = 'dev' + str(sub)
102
102
    elif release_type in ('alpha', 'beta'):
 
103
        if version_info[2] == 0:
 
104
            main_version = '%d.%d' % version_info[:2]
103
105
        sub_string = release_type[0] + str(sub)
104
106
    elif release_type == 'candidate':
105
107
        sub_string = 'rc' + str(sub)