Rev 3649: (jam) Merge 1.6.0-final in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3649
revision-id: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
parent: pqm at pqm.ubuntu.com-20080825155147-ftf2dt3m9bim9col
parent: john at arbash-meinel.com-20080825174941-8jaycasth6hrgxbi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-08-25 19:22:48 +0100
message:
  (jam) Merge 1.6.0-final
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3648.1.1
    revision-id: john at arbash-meinel.com-20080825174941-8jaycasth6hrgxbi
    parent: pqm at pqm.ubuntu.com-20080825155147-ftf2dt3m9bim9col
    parent: pqm at pqm.ubuntu.com-20080825143827-fl7cocq59pqdig2p
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2008-08-25 12:49:41 -0500
    message:
      Merge 1.6.0-final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3606.5.9
    revision-id: pqm at pqm.ubuntu.com-20080825143827-fl7cocq59pqdig2p
    parent: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
    parent: john at arbash-meinel.com-20080825140614-spjktabmbncx9bk8
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.6
    timestamp: Mon 2008-08-25 15:38:27 +0100
    message:
      (jam) 1.6.0-final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3606.9.1
    revision-id: john at arbash-meinel.com-20080825140614-spjktabmbncx9bk8
    parent: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2008-08-25 09:06:14 -0500
    message:
      1.6-final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2008-08-23 17:53:34 +0000
+++ b/NEWS	2008-08-25 17:49:41 +0000
@@ -86,6 +86,20 @@
       clients now use this mechanism.  (Neil Martinsen-Burrell)
 
 
+bzr 1.6 2008-08-25
+------------------
+
+Finally, the long awaited bzr 1.6 has been released. This release includes
+new features like Stacked Branches, improved weave merge, and an updated
+server protocol (now on v3) which will allow for better cross version
+compatibility. With this release we have deprecated Knit format
+repositories, and recommend that users upgrade them, we will continue to
+support reading and writing them for the forseeable future, but we will
+not be tuning them for performance as pack repositories have proven to be
+better at scaling. This will also be the first release to bundle
+TortoiseBzr in the standalone Windows installer.
+
+
 bzr 1.6rc5 2008-08-19
 ---------------------