Merge lp:~jameinel/bzr/2.0-full-version into lp:bzr/2.0

Proposed by John A Meinel
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jameinel/bzr/2.0-full-version
Merge into: lp:bzr/2.0
Diff against target: None lines
To merge this branch: bzr merge lp:~jameinel/bzr/2.0-full-version
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+11539@code.launchpad.net
To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

This changes 'bzr --version' to always print the full 3-tuple of major.minor.micro

So instead of getting "bzr v2.0" you get "bzr v2.0.0".

This seems to coincide with Martin's request about calling the release 2.0.0. (To clarify between things that need to land in 2.0.0 versus things that should just be landed in the 2.0.x stable release series.)

As such, I think it benefits the most to actually land it in 2.0.0 (-final) since once we get to 2.0.1 it won't make a difference since we will always show it.

Though it will effect trunk, since it will show 2.1.0beta1 rather than 2.1beta1. I could probably go either way, given that 'b1' can take the place of the micro, and we are unlikely to ever have 2.1.1beta1

Revision history for this message
John A Meinel (jameinel) wrote :

Note that this probably requires some test suite changes. I'm mostly proposing this to get feedback on whether we *want* to do it, and if it is approved, I'll go ahead and do the test fixes.

Revision history for this message
Martin Pool (mbp) wrote :

+1 from me, including for 2.0.0, though I'll leave this open for a bit to let others comment.

review: Approve
Revision history for this message
Matthew Fuller (fullermd) wrote :

> This changes 'bzr --version' to always print the full 3-tuple of
> major.minor.micro
>
> So instead of getting "bzr v2.0" you get "bzr v2.0.0".

Absolutely. If we expect a reasonable likelihood of a 2.0.1, we
should _definitely_ have a 2.0.0 instead of a 2.0. And having a 2.0.0
that calls itself 2.0 would just be nuts.

--
Matthew Fuller (MF4839) | <email address hidden>
Systems/Network Administrator | http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/__init__.py'
2--- bzrlib/__init__.py 2009-08-27 07:49:53 +0000
3+++ bzrlib/__init__.py 2009-09-10 15:46:31 +0000
4@@ -81,7 +81,7 @@
5 ...
6 ValueError: version_info (1, 4, 0, 'wibble', 0) not valid
7 """
8- if len(version_info) == 2 or version_info[2] == 0:
9+ if len(version_info) == 2:
10 main_version = '%d.%d' % version_info[:2]
11 else:
12 main_version = '%d.%d.%d' % version_info[:3]

Subscribers

People subscribed via source and target branches