Bazaar

Merge lp:~vila/bzr/prepare-2.0.6 into lp:bzr/2.0

  1. prepare-2.0.6
  2. Merge into 2.0
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 4760
Proposed branch: lp:~vila/bzr/prepare-2.0.6
Merge into: lp:bzr/2.0
Diff against target: 42 lines (+7/-3)
3 files modified
NEWS (+5/-1)
bzr (+1/-1)
bzrlib/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~vila/bzr/prepare-2.0.6
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+35779@code.launchpad.net

Commit message

Release 2.0.6.

Description of the change

Release 2.0.6.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

+1

Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2010-09-10 05:07:49 +0000
+++ NEWS 2010-09-17 06:09:28 +0000
@@ -9,7 +9,11 @@
9bzr 2.0.69bzr 2.0.6
10#########10#########
1111
12:2.0.6: NOT RELEASED YET12:2.0.6: 2010-09-17
13
14The sixth release in our 2.0 series addresses several user-inconvenience
15bugs. None are critical, but upgrading is recommended for all users on
16earlier 2.0 releases.
1317
14Bug Fixes18Bug Fixes
15*********19*********
1620
=== modified file 'bzr'
--- bzr 2010-03-23 06:55:16 +0000
+++ bzr 2010-09-17 06:09:28 +0000
@@ -23,7 +23,7 @@
23import warnings23import warnings
2424
25# update this on each release25# update this on each release
26_script_version = (2, 0, 5)26_script_version = (2, 0, 6)
2727
28if __doc__ is None:28if __doc__ is None:
29 print "bzr does not support python -OO."29 print "bzr does not support python -OO."
3030
=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py 2010-03-23 07:01:02 +0000
+++ bzrlib/__init__.py 2010-09-17 06:09:28 +0000
@@ -50,7 +50,7 @@
50# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a50# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
51# releaselevel of 'dev' for unreleased under-development code.51# releaselevel of 'dev' for unreleased under-development code.
5252
53version_info = (2, 0, 5, 'final', 0)53version_info = (2, 0, 6, 'final', 0)
5454
55# API compatibility version: bzrlib is currently API compatible with 1.15.55# API compatibility version: bzrlib is currently API compatible with 1.15.
56api_minimum_version = (1, 17, 0)56api_minimum_version = (1, 17, 0)

Subscribers

People subscribed via source and target branches