Rev 1490: [merge] robert in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1490
revision-id: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
parent: mbp at sourcefrog.net-20051216002517-73448ea063865983
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:39:31 +1100
message:
  [merge] robert
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051215083203-07b824bae89674c1
    parent: robertc at robertcollins.net-20051215032958-9ca8405f44373730
    parent: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2005-12-15 19:32:03 +1100
    message:
       * bzr add now lists how many files were ignored per glob.  add --verbose
         lists the specific files.  (Aaron Bentley)
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
    parent: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2005-12-14 13:34:11 -0500
    message:
      Updated NEWS about add and ignored
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
    parent: abentley at panoramicfeedback.com-20051213185657-3f900268287d6559
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2005-12-13 15:13:15 -0500
    message:
      Added verbose option to bzr add, to list all ignored files.
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051213185657-3f900268287d6559
    parent: abentley at panoramicfeedback.com-20051213175140-f78fa05a446006fa
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2005-12-13 13:56:57 -0500
    message:
      bzr add reports ignored patterns.
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051213175140-f78fa05a446006fa
    parent: abentley at panoramicfeedback.com-20051212172310-38340344da93b3cf
    parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2005-12-13 12:51:40 -0500
    message:
      Merged the mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051212172310-38340344da93b3cf
    parent: abentley at panoramicfeedback.com-20051212171442-c5eeec64016bb1f7
    parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2005-12-12 12:23:10 -0500
    message:
      Merged mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051212171442-c5eeec64016bb1f7
    parent: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2005-12-12 12:14:42 -0500
    message:
      Use unicode pathname in cmd_missing
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051215032958-9ca8405f44373730
    parent: robertc at robertcollins.net-20051215032111-e68d5e6ffbd4b574
    parent: michael at ellerman.id.au-20051212073124-b228f6206d4f395d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2005-12-15 14:29:58 +1100
    message:
      Take Michaels nicer NEWS entry for dry-run.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20051212073124-b228f6206d4f395d
    parent: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: add-dry-run
    timestamp: Mon 2005-12-12 01:31:24 -0600
    message:
      Add NEWS entry for bzr add --dry-run
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051215032111-e68d5e6ffbd4b574
    parent: robertc at robertcollins.net-20051214075934-6e951a9908674e50
    parent: michael at ellerman.id.au-20051210221145-7765347ea4ca0093
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2005-12-15 14:21:11 +1100
    message:
      * Raise NoSuchFile when someone tries to add a non-existant file.
        (Michael Ellerman)
      
      * Simplify handling of DivergedBranches in cmd_pull().
        (Michael Ellerman)
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20051210221145-7765347ea4ca0093
    parent: michael at ellerman.id.au-20051210221113-99ca561aaab4661e
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: fixes
    timestamp: Sat 2005-12-10 16:11:45 -0600
    message:
      Raise NoSuchFile when someone tries to add a non-existant file.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20051210221113-99ca561aaab4661e
    parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: fixes
    timestamp: Sat 2005-12-10 16:11:13 -0600
    message:
      Simplify handling of DivergedBranches in cmd_pull()
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051214075934-6e951a9908674e50
    parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
    parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2005-12-14 18:59:34 +1100
    message:
      merge from mbp.