Rev 1637: (mbp) fix #38331, #3619 in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1637
revision-id: pqm at pqm.ubuntu.com-20060413223715-b826d3cb591fed82
parent: pqm at pqm.ubuntu.com-20060413095251-762ef0074ed6104a
parent: mbp at sourcefrog.net-20060413055135-1a40ec5436f0dbd0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-13 23:37:15 +0100
message:
  (mbp) fix #38331, #3619
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413055135-1a40ec5436f0dbd0
    parent: mbp at sourcefrog.net-20060413053724-8c0053ac31492637
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 15:51:35 +1000
    message:
      diff on unversiond files should give an error (Malone #3619)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413053724-8c0053ac31492637
    parent: mbp at sourcefrog.net-20060413044224-14a48bb5724bec3d
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 15:37:24 +1000
    message:
      Give an error for bzr diff on an nonexistent file (Malone #3619)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413044224-14a48bb5724bec3d
    parent: mbp at sourcefrog.net-20060413042559-4db8365c299e624e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 14:42:24 +1000
    message:
      (internal_tree_files) Better docstring
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413042559-4db8365c299e624e
    parent: mbp at sourcefrog.net-20060413034805-5da73e30153f2ccf
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 14:25:59 +1000
    message:
      (RepositoryFormatKnit1.initialize) remove dead code that constructs weaves 
      in a knit repository, and also the unused control/ subdirectory.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413034805-5da73e30153f2ccf
    parent: mbp at sourcefrog.net-20060413031221-c5247090c275a7a3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 13:48:05 +1000
    message:
      init-repo shouldn't insist on creating a new directory (Malone #38331)