Rev 3401: (mbp) merge 1.4final back to trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3401
revision-id:pqm at pqm.ubuntu.com-20080502073615-9p6e3x4ijlv6bker
parent: pqm at pqm.ubuntu.com-20080502052056-i0fgnbrw89ueo423
parent: mbp at sourcefrog.net-20080502051009-ipu3n3ma01711eqe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 08:36:15 +0100
message:
  (mbp) merge 1.4final back to trunk
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3399.2.1
    revision-id:mbp at sourcefrog.net-20080502051009-ipu3n3ma01711eqe
    parent: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
    parent: pqm at pqm.ubuntu.com-20080501133316-80flel6b5rzez8an
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Fri 2008-05-02 15:10:09 +1000
    message:
      Merge 1.4final back to trunk
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3360.2.4
    revision-id:pqm at pqm.ubuntu.com-20080501133316-80flel6b5rzez8an
    parent: pqm at pqm.ubuntu.com-20080421101817-kaujt28rg33ijuoy
    parent: mbp at sourcefrog.net-20080501024246-x13lcwcda0h7j49f
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.4
    timestamp: Thu 2008-05-01 14:33:16 +0100
    message:
      Prepare 1.4final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
    ------------------------------------------------------------
    revno: 3360.2.3.1.2
    revision-id:mbp at sourcefrog.net-20080501024246-x13lcwcda0h7j49f
    parent: mbp at sourcefrog.net-20080501021124-0qn38w8zavyym5b8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.4
    timestamp: Thu 2008-05-01 12:42:46 +1000
    message:
      merge fix and test for #214894
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
    ------------------------------------------------------------
    revno: 3360.2.3.1.1
    revision-id:mbp at sourcefrog.net-20080501021124-0qn38w8zavyym5b8
    parent: pqm at pqm.ubuntu.com-20080421101817-kaujt28rg33ijuoy
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.4
    timestamp: Thu 2008-05-01 12:11:24 +1000
    message:
      Add news and version number for 1.4final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2008-05-01 07:03:04 +0000
+++ b/NEWS	2008-05-02 05:10:09 +0000
@@ -102,6 +102,25 @@
       (Aaron Bentley)
 
 
+bzr 1.4 2008-04-28
+------------------
+
+This release of Bazaar includes handy improvements to the speed of log and
+status, new options for several commands, improved documentation, and better
+hooks, including initial code for server-side hooks.  A number of bugs have
+been fixed, particularly in interoperability between different formats or
+different releases of Bazaar over there network.  There's been substantial
+internal work in both the repository and network code to enable new features
+and faster performance.
+
+  BUG FIXES:
+
+    * Pushing a branch in "dirstate" format (Branch5) over bzr+ssh would break
+      if the remote server was < version 1.2.  This was due to a bug in the
+      RemoteRepository.get_parent_map() fallback code.
+      (John Arbash Meinel, Andrew Bennetts, #214894)
+
+
 bzr 1.4rc2 2008-04-21
 ---------------------
 
@@ -128,10 +147,7 @@
 bzr 1.4rc1 2008-04-11
 ---------------------
 
-
-
-bzr 1.4rc1 2008-04-11
----------------------
+  CHANGES:
 
    * bzr main script cannot be imported (Benjamin Peterson)
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-04-30 08:04:11 +0000
+++ b/bzrlib/__init__.py	2008-05-02 05:10:09 +0000
@@ -43,6 +43,7 @@
 
 version_info = (1, 5, 0, 'dev', 0)
 
+
 # API compatibility version: bzrlib is currently API compatible with 0.18.
 api_minimum_version = (0, 18, 0)