Rev 1843: diff always permits filenames from working directory in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Jul 6 15:54:00 BST 2006


------------------------------------------------------------
revno: 1843
revision-id: pqm at pqm.ubuntu.com-20060706145359-27c4289acd83b54e
parent: pqm at pqm.ubuntu.com-20060706031529-e189d8c3f42076be
parent: abentley at panoramicfeedback.com-20060706135122-3c6819dcd96886b7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-07-06 15:53:59 +0100
message:
  diff always permits filenames from working directory
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060706135122-3c6819dcd96886b7
    parent: aaron.bentley at utoronto.ca-20060705120125-969be50377a02249
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-07-06 09:51:22 -0400
    message:
      Changes from review
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060705120125-969be50377a02249
    parent: aaron.bentley at utoronto.ca-20060705051806-857afb07bf645354
    parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-07-05 08:01:25 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060705051806-857afb07bf645354
    parent: aaron.bentley at utoronto.ca-20060705050334-81a788244660bb22
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-07-05 01:18:06 -0400
    message:
      Update argument order
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060705050334-81a788244660bb22
    parent: aaron.bentley at utoronto.ca-20060705043020-40885528b9673340
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-07-05 01:03:34 -0400
    message:
      Always include working tree when calculating file ids for diff
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060705043020-40885528b9673340
    parent: aaron.bentley at utoronto.ca-20060705042200-4ccb4232e524f148
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-07-05 00:30:20 -0400
    message:
      Indentation and documentation fixes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060705042200-4ccb4232e524f148
    parent: aaron.bentley at utoronto.ca-20060705004733-98a8bbb838b550fe
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-07-05 00:22:00 -0400
    message:
      Switch to PathsNotVersioned, accept extra_trees
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060705004733-98a8bbb838b550fe
    parent: aaron.bentley at utoronto.ca-20060705003845-c05e0e47dcdf0381
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-07-04 20:47:33 -0400
    message:
      Fix docs
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060705003845-c05e0e47dcdf0381
    parent: abentley at panoramicfeedback.com-20060704162105-48840ede345fc8c1
    parent: pqm at pqm.ubuntu.com-20060704173203-6de4c6bbbe1a6149
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-07-04 20:38:45 -0400
    message:
      merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060704162105-48840ede345fc8c1
    parent: aaron.bentley at utoronto.ca-20060702193142-16e6b7554e3620db
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2006-07-04 12:21:05 -0400
    message:
      Use specified_file_ids instead of is_inside_any in compare_trees



More information about the bazaar-commits mailing list