Rev 2105: (Cheuksan Edward Wang, Kent Gibson) bug fixes for 'bzr ignore' (#29488, #4559) in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2105
revision-id: pqm at pqm.ubuntu.com-20061031213938-414c21b74ac463b8
parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
parent: john at arbash-meinel.com-20061031193921-6d047611ba22c665
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-31 21:39:38 +0000
message:
  (Cheuksan Edward Wang, Kent Gibson) bug fixes for 'bzr ignore' (#29488, #4559)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/ignores.py              ignores.py-20060712153832-2von9l0t7p43ixsv-1
  bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
  bzrlib/tests/test_ignores.py   test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061031193921-6d047611ba22c665
    parent: john at arbash-meinel.com-20061031193444-5625664a35654df5
    parent: warthog618 at gmail.com-20061014102850-16fdc0e05ccad845
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-10-31 13:39:21 -0600
    message:
      (Kent Gibson) Fix bug #4559, strip trailing slashes from ignore patterns
        ------------------------------------------------------------
        merged: warthog618 at gmail.com-20061014102850-16fdc0e05ccad845
        parent: warthog618 at gmail.com-20061014102436-ab2ea458158a9933
        committer: Kent Gibson <warthog618 at gmail.com>
        branch nick: bzr.lp4559
        timestamp: Sat 2006-10-14 18:28:50 +0800
        message:
          Strip trailing slashes from ignore patterns (#4559).
          Complain about absolute paths in ignore patterns.
        ------------------------------------------------------------
        merged: warthog618 at gmail.com-20061014102436-ab2ea458158a9933
        parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
        committer: Kent Gibson <warthog618 at gmail.com>
        branch nick: bzr.lp4559
        timestamp: Sat 2006-10-14 18:24:36 +0800
        message:
          merge ignore_multiple_5.patch (Wang #29844)
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20061031193444-5625664a35654df5
    parent: pqm at pqm.ubuntu.com-20061031173033-95e11019fbb103f3
    parent: wang at ubuntu-20061012094707-9716abbbe6a7a022
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2006-10-31 13:34:44 -0600
    message:
      (Cheuksan Edward Wang) Fix bug #29488, allow 'bzr ignore' to take multiple paths
    ------------------------------------------------------------
    merged: wang at ubuntu-20061012094707-9716abbbe6a7a022
    parent: wang at ubuntu-20061012073426-3b56e6ed675ca36e
    parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
    committer: wang <wang at ubuntu>
    branch nick: ignore-branch
    timestamp: Thu 2006-10-12 17:47:07 +0800
    message:
      resolve a conflict
    ------------------------------------------------------------
    merged: wang at ubuntu-20061012073426-3b56e6ed675ca36e
    parent: wang at ubuntu-20061010234350-f3dadeeb4006096b
    committer: wang <wang at ubuntu>
    branch nick: ignore-branch
    timestamp: Thu 2006-10-12 15:34:26 +0800
    message:
      Copy Kent Gibson's changes that incorporates John Arbash Meinel's 
      review comments for me.
    ------------------------------------------------------------
    merged: wang at ubuntu-20061010234350-f3dadeeb4006096b
    parent: wang at ubuntu-20061010152001-9543f8e5b3f0f9ea
    committer: wang <wang at ubuntu>
    branch nick: ignore-branch
    timestamp: Wed 2006-10-11 07:43:50 +0800
    message:
      Change error message. Use spaces instead of tabs.
    ------------------------------------------------------------
    merged: wang at ubuntu-20061010152001-9543f8e5b3f0f9ea
    parent: wang at ubuntu-20061010073621-c17937e940897fdc
    committer: wang <wang at ubuntu>
    branch nick: ignore-branch
    timestamp: Tue 2006-10-10 23:20:01 +0800
    message:
      Don't use mutable values as default argument definitions.
    ------------------------------------------------------------
    merged: wang at ubuntu-20061010073621-c17937e940897fdc
    parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
    committer: wang <wang at ubuntu>
    branch nick: ignore-branch
    timestamp: Tue 2006-10-10 15:36:21 +0800
    message:
      "bzr ignore" takes multiple arguments. Fixes bug 29488.