Rev 215: Merge from ab-baz2bzr. in /home/robertc/source/baz/plugins/bzrtools/trunk/

[Robert Collins]

------------------------------------------------------------
revno: 215
revision-id: robertc at robertcollins.net-20060307233714-79a35108099f3766
parent: robertc at robertcollins.net-20060307071054-30bcc931e22c0c3c
parent: abentley at panoramicfeedback.com-20060307172508-5e790d4de816d62f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Wed 2006-03-08 10:37:14 +1100
message:
  Merge from ab-baz2bzr.
modified:
  __init__.py                    __init__.py-20051019101947-f758f1a696725014
  baz_import.py                  baz_import.py-20050614155149-bd6a5b1bff67db25
  bzrtools.py                    scriptlib.py-20050501073634-776a13caa8838cf4
  graph.py                       graph.py-20050830163250-0e1e9231f278d221
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307172508-5e790d4de816d62f
    parent: abentley at panoramicfeedback.com-20060307170739-6574fb4085c5f4fe
    parent: abentley at panoramicfeedback.com-20060307172304-81a37ded2450ce99
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2006-03-07 12:25:08 -0500
    message:
      Merge fixes to test suite
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307172304-81a37ded2450ce99
    parent: abentley at panoramicfeedback.com-20060307152150-f0e4f0174eb6d241
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2006-03-07 12:23:04 -0500
    message:
      Fixed up Robert's test changes
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307152150-f0e4f0174eb6d241
    parent: abentley at panoramicfeedback.com-20060306155642-1305ad508a608acc
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2006-03-07 10:21:50 -0500
    message:
      Applied Robert's random fixes as non-merges
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060306155642-1305ad508a608acc
    parent: abentley at panoramicfeedback.com-20060302141119-7a5ee02eb6483c50
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Mon 2006-03-06 10:56:42 -0500
    message:
      Forced dot output to UTF-8
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307170739-6574fb4085c5f4fe
    parent: abentley at panoramicfeedback.com-20060307152315-42337454a0ad956b
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2006-03-07 12:07:39 -0500
    message:
      Switched to blacnk branch-nicks
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307152315-42337454a0ad956b
    parent: abentley at panoramicfeedback.com-20060307150329-b2c79effccfdd961
    parent: abentley at panoramicfeedback.com-20060307152150-f0e4f0174eb6d241
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2006-03-07 10:23:15 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307150329-b2c79effccfdd961
    parent: abentley at panoramicfeedback.com-20060307141349-09932daa892c0005
    parent: robertc at robertcollins.net-20060307071054-30bcc931e22c0c3c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2006-03-07 10:03:29 -0500
    message:
      Merge from Robert
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307141349-09932daa892c0005
    parent: abentley at panoramicfeedback.com-20060303163547-cc1666d256b1a8d7
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Tue 2006-03-07 09:13:49 -0500
    message:
      Handle NoWorkingTree too