Rev 2107: (Cheuksan Edward Wang) Fix bug #30190: allow 'bzr cat' to look up paths in multiple trees in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2107
revision-id: pqm at pqm.ubuntu.com-20061031215814-a9a1857c6e196637
parent: pqm at pqm.ubuntu.com-20061031214853-e5d2dc184d12ddea
parent: john at arbash-meinel.com-20061031205647-0e85ae2afb274664
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 21:58:14 +0000
message:
  (Cheuksan Edward Wang) Fix bug #30190: allow 'bzr cat' to look up paths in multiple trees
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061031205647-0e85ae2afb274664
    parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
    parent: wang at ubuntu-20061016105443-05ed299b80702d34
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: wang_30190
    timestamp: Tue 2006-10-31 14:56:47 -0600
    message:
      (Cheuksan Edward Wang) Fix bug #30190: allow 'bzr cat' to look up paths in multiple trees
    ------------------------------------------------------------
    merged: wang at ubuntu-20061016105443-05ed299b80702d34
    parent: wang at ubuntu-20061016070533-083b9847a4b2a3d1
    committer: wang <wang at ubuntu>
    branch nick: bzr-cat-branch
    timestamp: Mon 2006-10-16 18:54:43 +0800
    message:
      Fix syntax error in test.
    ------------------------------------------------------------
    merged: wang at ubuntu-20061016070533-083b9847a4b2a3d1
    parent: wang at ubuntu-20061016040409-0fd564a13878aca6
    committer: wang <wang at ubuntu>
    branch nick: bzr-cat-branch
    timestamp: Mon 2006-10-16 15:05:33 +0800
    message:
      Change option name to --name-from-revision. Always make new tree the 
      default. Rewrite some tests.
    ------------------------------------------------------------
    merged: wang at ubuntu-20061016040409-0fd564a13878aca6
    parent: wang at ubuntu-20061013150913-2ff0be213f6f8a75
    committer: wang <wang at ubuntu>
    branch nick: bzr-cat-branch
    timestamp: Mon 2006-10-16 12:04:09 +0800
    message:
      Make the decision tree a little clearer. Add more tests for exceptions.
    ------------------------------------------------------------
    merged: wang at ubuntu-20061013150913-2ff0be213f6f8a75
    parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
    committer: wang <wang at ubuntu>
    branch nick: bzr-cat-branch
    timestamp: Fri 2006-10-13 23:09:13 +0800
    message:
      ``bzr cat`` can look up contents of removed or renamed files. If the
      pathname is ambiguous, i.e. the files in the old and new trees 
      have different id's, the user needs to use "--old" or "--new" to 
      distinguish between them. If the pathname refers to a single file, the options 
      are unnecessary. Fixes bug #30190.