Rev 196: Merge from Aaron. in /home/robertc/source/baz/bzrtools

------------------------------------------------------------
revno: 196
revision-id: robertc at robertcollins.net-20051027205434-7ab7e2c4e65261e8
parent: robertc at robertcollins.net-20051024093146-e8ebf09b05d1fc55
parent: aaron.bentley at utoronto.ca-20051024000803-0e9b59dee42d0460
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-27 16:54:34 -0400
message:
  Merge from Aaron.
added:
  setup.py                       setup.py-20051019190214-38b3a1652920bf7a
modified:
  .bzrignore                     bzrignore-20050430072933-1fba2c2cbedbe7e7
  INSTALL                        INSTALL-20050507104657-93be314e40bb52a9
  NEWS                           NEWS-20050607185005-1d99ddda6117a97e
  __init__.py                    __init__.py-20050622190719-8f8857cdbb1f4d95
  push.py                        push.py-20050613212944-7a14fd8687480ba6
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051024000803-0e9b59dee42d0460
    parent: abentley at panoramicfeedback.com-20051019192114-c02c696ac1890191
    parent: robertc at robertcollins.net-20051023225620-7ae2727d90bba914
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    timestamp: Sun 2005-10-23 20:08:03 -0400
    message:
      Merge lifeless
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051019192114-c02c696ac1890191
    parent: robertc at robertcollins.net-20051019053026-1065551f14648c22
    parent: abentley at panoramicfeedback.com-20051019190704-8d71f7a70bcd19c4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Wed 2005-10-19 15:21:14 -0400
    message:
      Merged from mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051019190704-8d71f7a70bcd19c4
    parent: abentley at panoramicfeedback.com-20051019181537-67e2a4c3755f03cf
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Wed 2005-10-19 15:07:04 -0400
    message:
      Added setup.py, updated INSTALL, NEWS
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051019181537-67e2a4c3755f03cf
    parent: abentley at panoramicfeedback.com-20051019181214-7cc244b0639f705f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Wed 2005-10-19 14:15:37 -0400
    message:
      Updated install instructions
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051019181214-7cc244b0639f705f
    parent: abentley at panoramicfeedback.com-20051018204120-0eef5380989fb022
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Wed 2005-10-19 14:12:14 -0400
    message:
      Changed overwrite description
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051018204120-0eef5380989fb022
    parent: abentley at panoramicfeedback.com-20051018201759-a5dfcbed504c3d22
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Tue 2005-10-18 16:41:20 -0400
    message:
      tweaked help message
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051018201759-a5dfcbed504c3d22
    parent: abentley at panoramicfeedback.com-20051018192040-eab4f299f13496ad
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Tue 2005-10-18 16:17:59 -0400
    message:
      Adopted Branch.open_containing's new format
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051018192040-eab4f299f13496ad
    parent: abentley at panoramicfeedback.com-20051017201715-3df1dee62e126f22
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    timestamp: Tue 2005-10-18 15:20:40 -0400
    message:
      Updated patch to new options regime