Rev 2049: Revert deletes files that don't exist in target if not locally modified in /home/pqm/archives/thelove/bzr/+trunk/

Wed Sep 27 21:44:32 BST 2006

------------------------------------------------------------
revno: 2049
revision-id: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
parent: pqm at pqm.ubuntu.com-20060927202746-942eb21d12b7edc7
parent: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 21:44:31 +0100
message:
  Revert deletes files that don't exist in target if not locally modified
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_revert.py    test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
    parent: abentley at panoramicfeedback.com-20060927202832-9795d0528e311e31
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-09-27 16:34:08 -0400
    message:
      Update NEWS
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060927202832-9795d0528e311e31
    parent: abentley at panoramicfeedback.com-20060927191452-b1d0d8271a0ac936
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-09-27 16:28:32 -0400
    message:
      Changes from review
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060927191452-b1d0d8271a0ac936
    parent: abentley at panoramicfeedback.com-20060927184954-2e997cc52926235c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-09-27 15:14:52 -0400
    message:
      Fix iteraction of revert and files not present in target_tree
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060927184954-2e997cc52926235c
    parent: abentley at panoramicfeedback.com-20060922195719-64973e4cd0d704ce
    parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-09-27 14:49:54 -0400
    message:
      Merge from bzr.dev