Rev 211: Merge from abentley. in /home/robertc/source/baz/plugins/bzrtools/trunk

[Robert Collins]

------------------------------------------------------------
revno: 211
revision-id: robertc at robertcollins.net-20051205071830-0fb068e539b30ab9
parent: robertc at robertcollins.net-20051204231419-4677956db751c579
parent: aaron.bentley at utoronto.ca-20051203212510-189717b33bc68494
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Mon 2005-12-05 18:18:30 +1100
message:
  Merge from abentley.
added:
  branchhistory.py               ancestry.py-20051129154454-419cfcc7ab46eb80
modified:
  __init__.py                    __init__.py-20051019101947-f758f1a696725014
  bzrtools.py                    scriptlib.py-20050501073634-776a13caa8838cf4
  graph.py                       graph.py-20050830163250-0e1e9231f278d221
  shelf_tests.py                 tests.py-20051019130958-0edcded95321bddd
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203212510-189717b33bc68494
    parent: aaron.bentley at utoronto.ca-20051203212302-4cd6acc6140ebfc6
    parent: aaron.bentley at utoronto.ca-20051203212142-2dad12fcec98a895
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Sat 2005-12-03 16:25:10 -0500
    message:
      merged mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203212142-2dad12fcec98a895
    parent: abentley at panoramicfeedback.com-20051129163717-fd313b19ffabd87f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Sat 2005-12-03 16:21:42 -0500
    message:
      Fixed test case failure
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051129163717-fd313b19ffabd87f
    parent: abentley at panoramicfeedback.com-20051129161901-45074607ac3a37a6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-29 11:37:17 -0500
    message:
      Print the last revision range in branch_history
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051129161901-45074607ac3a37a6
    parent: abentley at panoramicfeedback.com-20051129161344-3997ed0518fbdb2d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-29 11:19:01 -0500
    message:
      Updated help
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051129161344-3997ed0518fbdb2d
    parent: aaron.bentley at utoronto.ca-20051129024058-2583a0a9f5b3615d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2005-11-29 11:13:44 -0500
    message:
      Introduced branch-history command
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051129024058-2583a0a9f5b3615d
    parent: aaron.bentley at utoronto.ca-20051126000811-82d43e20670a2de8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Mon 2005-11-28 21:40:58 -0500
    message:
      Adjusted to selftest -> tests change 
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051126000811-82d43e20670a2de8
    parent: abentley at panoramicfeedback.com-20051124165113-76977367c6f4dc34
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Fri 2005-11-25 19:08:11 -0500
    message:
      Adjusted to match API changes
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20051124165113-76977367c6f4dc34
    parent: aaron.bentley at utoronto.ca-20051119202745-b32f58046c98c3cc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Thu 2005-11-24 11:51:13 -0500
    message:
      Updated shelf help
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203212302-4cd6acc6140ebfc6
    parent: aaron.bentley at utoronto.ca-20051203204225-25678bc921de4fc1
    parent: abentley at panoramicfeedback.com-20051129163717-fd313b19ffabd87f
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Sat 2005-12-03 16:23:02 -0500
    message:
      Merged mainline
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051203204225-25678bc921de4fc1
    parent: abentley at panoramicfeedback.com-20051121144351-0244872ccd1308f8
    parent: robertc at robertcollins.net-20051129001122-a315bd9d60053147
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools.baz2bzr
    timestamp: Sat 2005-12-03 15:42:25 -0500
    message:
      Merge from lifeless