Rev 1634: (mbp) ftp push fix; Working_tree.set_inventory; test suite warnings in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1634
revision-id: pqm at pqm.ubuntu.com-20060413034259-6466a758a88b4a94
parent: pqm at pqm.ubuntu.com-20060412235011-e395c05df01335a9
parent: mbp at sourcefrog.net-20060413031221-c5247090c275a7a3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-13 04:42:59 +0100
message:
  (mbp) ftp push fix; Working_tree.set_inventory; test suite warnings
modified:
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413031221-c5247090c275a7a3
    parent: mbp at sourcefrog.net-20060413031008-89709c21c76b16cf
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 13:12:21 +1000
    message:
      Release more locks taken during test suite
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413031008-89709c21c76b16cf
    parent: mbp at sourcefrog.net-20060413030656-d341283822ba9043
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 13:10:08 +1000
    message:
      Quieten warning from TestFormat7.test_creates_lockdir about failing to unlock
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413030656-d341283822ba9043
    parent: mbp at sourcefrog.net-20060413030614-3a65b585233b029f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 13:06:56 +1000
    message:
      Doc
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413030614-3a65b585233b029f
    parent: mbp at sourcefrog.net-20060413023336-ed862740f63ef8f5
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 13:06:14 +1000
    message:
      Revert changes to WorkingTree.set_inventory to unbreak bzrtools
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060413023336-ed862740f63ef8f5
    parent: pqm at pqm.ubuntu.com-20060412235011-e395c05df01335a9
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-04-13 12:33:36 +1000
    message:
      Fix FTP push with metadir format (Alexandre Saint)
      
      It adds a rmdir() method and makes rename() an alias of move(). Makes delete()
      raise a NoSuchFile exception when appropriate (instead of a TransportError
      which made the logic always fail).