Rev 2216: Merge from bzr.dev in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2216
revision-id: andrew.bennetts at canonical.com-20070413062359-kiqjbhb06b3j2fj1
parent: andrew.bennetts at canonical.com-20070413061840-gb25wprbcivfeyuo
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 16:23:59 +1000
message:
  Merge from bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1
    merged: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
    parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
    parent: andrew.bennetts at canonical.com-20070413010947-wdy5e6gexv20k98b
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-04-13 06:06:23 +0100
    message:
      (Andrew Bennetts, Robert Collins) Add a 'token' argument to lock_write.
=== modified file 'NEWS'
--- a/NEWS	2007-04-13 05:48:30 +0000
+++ b/NEWS	2007-04-13 06:23:59 +0000
@@ -47,6 +47,11 @@
       it's not really a "smart" transport, just one that does file operations
       via remote procedure calls.  (Andrew Bennetts)
  
+    * The ``lock_write`` method of ``LockableFiles``, ``Repository`` and
+     ``Branch`` now accept a ``token`` keyword argument, so that separate
+     instances of those objects can share a lock if it has the right token.
+     (Andrew Bennetts, Robert Collins)
+
     * The Repository API ``make_working_trees`` is now permitted to return
       False when ``set_make_working_trees`` is not implemented - previously
       an unimplemented ``set_make_working_trees`` implied the result True
@@ -54,11 +59,6 @@
       smart server, where it does not make sense (at this point) to ever
       make working trees by default. (Robert Collins)
 
-    * The ``lock_write`` method of ``LockableFiles``, ``Repository`` and
-     ``Branch`` now accept a ``token`` keyword argument, so that separate
-     instances of those objects can share a lock if it has the right token.
-     (Andrew Bennetts, Robert Collins)
-
   BUGFIXES:
 
     * Don't fail bundle selftest if email has 'two' embedded.