Rev 1447: [merge] aaron in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1447
revision-id: mbp at sourcefrog.net-20051128042154-862e59e71e8cd5c5
parent: mbp at sourcefrog.net-20051128032041-b83d451b0a70bcd5
parent: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Mon 2005-11-28 15:21:54 +1100
message:
  [merge] aaron
modified:
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
    parent: aaron.bentley at utoronto.ca-20051126012317-0af7f775be52b3ab
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2005-11-25 20:32:18 -0500
    message:
      Added test for renaming both parent and child
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051126012317-0af7f775be52b3ab
    parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2005-11-25 20:23:17 -0500
    message:
      Test case when file to be renamed is also deleted