Rev 1630: Minor bugfixes in /home/pqm/archives/thelove/bzr/+trunk/

Wed Apr 12 07:22:46 BST 2006

------------------------------------------------------------
revno: 1630
revision-id: pqm at pqm.ubuntu.com-20060412062244-b1ea5860b8463060
parent: pqm at pqm.ubuntu.com-20060412061132-beffbe6feb9bc734
parent: aaron.bentley at utoronto.ca-20060412055057-a0679e57841da975
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 07:22:44 +0100
message:
  Minor bugfixes
modified:
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060412055057-a0679e57841da975
    parent: aaron.bentley at utoronto.ca-20060412054322-ba4676fe659f2707
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: fix-mergesums
    timestamp: Wed 2006-04-12 01:50:57 -0400
    message:
      Be robust when merge_hash file_id not in inventory
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060412054322-ba4676fe659f2707
    parent: aaron.bentley at utoronto.ca-20060412045516-a3534bcfb08241f6
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: fix-mergesums
    timestamp: Wed 2006-04-12 01:43:22 -0400
    message:
      Handle resolving conflicts with directories properly
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060412045516-a3534bcfb08241f6
    parent: aaron.bentley at utoronto.ca-20060412030132-a1cf79509acb12a9
    parent: pqm at pqm.ubuntu.com-20060412032139-5508773d6a1cd4ae
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: revert-missing
    timestamp: Wed 2006-04-12 00:55:16 -0400
    message:
      Merge from bzr.dev