At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3769
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Tue 2008-10-07 12:03:56 +0100
message:
(mbp) Merge back 1.8 and open 1.9
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3767.2.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: integration
timestamp: Tue 2008-10-07 21:00:40 +1100
message:
Merge back 1.8 and open 1.9
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3763.3.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: 1.8
timestamp: Tue 2008-10-07 10:12:57 +0100
message:
(mbp) prepare 1.8rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx
dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_readdir_pyx.pyx
readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/transport/__init__.py
transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp/_gssapi.py
_gssapi.py-20080611190840-7ejrtp884bk5eu72-2
------------------------------------------------------------
revno: 3767.1.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: prepare-1.8
timestamp: Tue 2008-10-07 19:30:08 +1100
message:
Update news for 1.8rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3767.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: prepare-1.8
timestamp: Tue 2008-10-07 19:00:41 +1100
message:
Bump version to 1.8rc1
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS 2008-10-07 04:41:23 +0000
+++ b/NEWS 2008-10-07 10:00:40 +0000
@@ -7,6 +7,16 @@
IN DEVELOPMENT
--------------
+bzr 1.8rc1 2008-10-07
+---------------------
+
+Bazaar 1.8 includes several fixes that improve working tree performance,
+display of revision logs, and merges. We've also fixed, and the bzr
+testsuite now passes on OS X and Python 2.6, and almost completely passes
+on Windows. The smartserver code has gained several bug fixes and
+performance improvements, and can now run server-side hooks within an http
+server.
+
CHANGES:
* ``bzr log file`` has been changed. It now uses a different method
@@ -32,7 +42,7 @@
* bzr is now compatible with python-2.6. python-2.6 is not yet officially
supported (nor released, tests were conducted with the dev version of
- python-2.6rc2), but all known problems have been fixed . Feedback
+ python-2.6rc2), but all known problems have been fixed. Feedback
welcome.
(Vincent Ladeuil, #269535)
=== modified file 'bzr'
--- a/bzr 2008-10-01 05:40:45 +0000
+++ b/bzr 2008-10-07 10:00:40 +0000
@@ -22,7 +22,7 @@
import sys
# update this on each release
-_script_version = (1, 8, 0)
+_script_version = (1, 9, 0)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2008-10-01 23:17:47 +0000
+++ b/bzrlib/__init__.py 2008-10-07 10:00:40 +0000
@@ -50,7 +50,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (1, 8, 0, 'dev', 0)
+version_info = (1, 9, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 1.7.
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
