Rev 1521: [merge] test_hashcache_raise from Denys in /home/mbp/work/bzr.dev/

[Martin Pool]

------------------------------------------------------------
revno: 1521
revision-id: mbp at sourcefrog.net-20060113081222-6b572004a2ade0cc
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
parent: denys.duchier at mozart-oz.org-20060112161054-90a5f1b649d87ee0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 19:12:22 +1100
message:
  [merge] test_hashcache_raise from Denys
modified:
  bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060112161054-90a5f1b649d87ee0
    parent: denys.duchier at mozart-oz.org-20060112092814-aa4a8fc83ad6df5e
    parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.patches
    timestamp: Thu 2006-01-12 17:10:54 +0100
    message:
      sync with bzr.dev mainline
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060112092814-aa4a8fc83ad6df5e
    parent: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
    parent: denys.duchier at mozart-oz.org-20060112012636-dde78a3a3314b5aa
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.patches
    timestamp: Thu 2006-01-12 10:28:14 +0100
    message:
      merged hashcache test after +2 approval
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060112012636-dde78a3a3314b5aa
    parent: denys.duchier at mozart-oz.org-20060112003410-a96048b76f8c6fa9
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.tests
    timestamp: Thu 2006-01-12 02:26:36 +0100
    message:
      test_hashcache_raise: minor space fix
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060112003410-a96048b76f8c6fa9
    parent: denys.duchier at mozart-oz.org-20060111225357-972e0c46ca0e5263
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.tests
    timestamp: Thu 2006-01-12 01:34:10 +0100
    message:
      test_hashcache: catch no exceptions
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111225357-972e0c46ca0e5263
    parent: denys.duchier at mozart-oz.org-20060111215238-78996c3541a0b637
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.tests
    timestamp: Wed 2006-01-11 23:53:57 +0100
    message:
      test_hashcache_raise: complain if no weird file type can be created
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111215238-78996c3541a0b637
    parent: denys.duchier at mozart-oz.org-20060111201505-42a209128c43128b
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.tests
    timestamp: Wed 2006-01-11 22:52:38 +0100
    message:
      simplified test_hashcache_raise as advised by jam
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111201505-42a209128c43128b
    parent: denys.duchier at mozart-oz.org-20060109211151-7714c42575b9a601
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.tests
    timestamp: Wed 2006-01-11 21:15:05 +0100
    message:
      check that hashcache can raise BzrError
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060109211151-7714c42575b9a601
    parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
    parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.tests
    timestamp: Mon 2006-01-09 22:11:51 +0100
    message:
      merged from trunk
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
    parent: denys.duchier at mozart-oz.org-20060109213204-bfc723a545be8093
    parent: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.patches
    timestamp: Tue 2006-01-10 00:52:37 +0100
    message:
      merged in removal of apply_changeset and get_inventory_change after getting +2 on it
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060109213204-bfc723a545be8093
    parent: denys.duchier at mozart-oz.org-20051223182436-196e481a0d75b65d
    parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.patches
    timestamp: Mon 2006-01-09 22:32:04 +0100
    message:
      merged from trunk
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20051223182436-196e481a0d75b65d
    parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
    parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.patches
    timestamp: Fri 2005-12-23 19:24:36 +0100
    message:
      merged bzr.tests up to revision 1494