Rev 1394: Merge from Martin. in /home/robertc/source/baz/bzr-integration

------------------------------------------------------------
revno: 1394
revision-id: robertc at robertcollins.net-20051030000009-9db99a338a0dfdac
parent: robertc at robertcollins.net-20051029234845-7ae4e7d118bdd3ed
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 20:00:09 -0400
message:
  Merge from Martin.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/merge3.py               merge3.py-20050704130834-bf0597094828a2e1
  bzrlib/merge_core.py           merge_core.py-20050513021216-eda88728698d4401
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/selftest/blackbox.py    blackbox.py-20050620052131-a7370d756399f615
  bzrlib/selftest/testmerge.py   testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/selftest/testmerge3.py  merge3.py-20050704130834-556689114c89e6f2
  bzrlib/selftest/testoptions.py testoptions.py-20051014093702-96457cfc86319a8f
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
    parent: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
    parent: john at arbash-meinel.com-20051027205644-deb2019ab9deebd9
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Fri 2005-10-28 15:53:02 +1000
    message:
      [merge] fixes for ls
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051027205644-deb2019ab9deebd9
    parent: john at arbash-meinel.com-20051027204409-98cc537ee55a9f2e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Thu 2005-10-27 15:56:44 -0500
    message:
      Added more tests.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20051027204409-98cc537ee55a9f2e
    parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
    committer: John Arbash Meinel <john at arbash-meinel.com>
    timestamp: Thu 2005-10-27 15:44:09 -0500
    message:
      Made ls work again, and take extra arguments.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
    parent: mbp at sourcefrog.net-20051028053540-3eb02450833461e1
    parent: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Fri 2005-10-28 15:49:49 +1000
    message:
      [merge] short-option fix and merge --reprocess
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
    parent: abentley at panoramicfeedback.com-20051027234449-f257689f3a79d80a
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Thu 2005-10-27 22:34:22 -0400
    message:
      Restored short options in help
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051027234449-f257689f3a79d80a
    parent: abentley at panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-10-27 19:44:49 -0400
    message:
      Updated NEWS
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
    parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
    parent: abentley at panoramicfeedback.com-20051027234145-cc851c8f0f63eaba
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-10-27 19:43:15 -0400
    message:
      Merged reprocessing for merge
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051027234145-cc851c8f0f63eaba
    parent: abentley at panoramicfeedback.com-20051027231448-ba0ae9cde819edc9
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-10-27 19:41:45 -0400
    message:
      Integrated reprocessing into the rest of the merge stuff
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051027231448-ba0ae9cde819edc9
    parent: abentley at panoramicfeedback.com-20051027230926-4e9911d404596430
    parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-10-27 19:14:48 -0400
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051027230926-4e9911d404596430
    parent: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Thu 2005-10-27 19:09:26 -0400
    message:
      Got reprocessing working
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051028053540-3eb02450833461e1
    parent: mbp at sourcefrog.net-20051027035040-076326e2321b5257
    parent: aaron.bentley at utoronto.ca-20051028043558-b39b4663f21c99dc
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Fri 2005-10-28 15:35:40 +1000
    message:
      [merge] win32 fixes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028043558-b39b4663f21c99dc
    parent: aaron.bentley at utoronto.ca-20051028043446-9a5efa4bc437d071
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-10-28 00:35:58 -0400
    message:
      win32 locking fix from Belchenko
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028043446-9a5efa4bc437d071
    parent: aaron.bentley at utoronto.ca-20051028043155-f87e0a6f5e905b12
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-10-28 00:34:46 -0400
    message:
      win32 glob expansion fix from Belchenko
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051028043155-f87e0a6f5e905b12
    parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Fri 2005-10-28 00:31:55 -0400
    message:
      win32 setup fixes from Belchenko
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051027035040-076326e2321b5257
    parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
    committer: Martin Pool <mbp at sourcefrog.net>
    timestamp: Thu 2005-10-27 13:50:40 +1000
    message:
      Prepare for 0.6rc1