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

[Robert Collins]

------------------------------------------------------------
revno: 217
revision-id: robertc at robertcollins.net-20060421003357-f6f83e12d5c143b8
parent: robertc at robertcollins.net-20060417110138-8b47d227583b5b28
parent: abentley at panoramicfeedback.com-20060417140128-e317e9d49b1c1baa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Fri 2006-04-21 10:33:57 +1000
message:
  Merge from ab-trunk.
added:
  branch_mark.py                 branch_mark.py-20060414215630-1ffa6c3c37654d42
modified:
  __init__.py                    __init__.py-20051019101947-f758f1a696725014
  baz_import.py                  baz_import.py-20050614155149-bd6a5b1bff67db25
  switch.py                      switch.py-20060412002645-591f54267880ac10
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060417140128-e317e9d49b1c1baa
    parent: abentley at panoramicfeedback.com-20060417134034-6e23a2000508f1e6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Mon 2006-04-17 10:01:28 -0400
    message:
      Tweaked descriptions
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060417134034-6e23a2000508f1e6
    parent: abentley at panoramicfeedback.com-20060412181333-de8c5c460e75696f
    parent: aaron.bentley at utoronto.ca-20060414231339-c8527e18fbc64436
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzrtools
    timestamp: Mon 2006-04-17 09:40:34 -0400
    message:
      Merge branch marking
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060414231339-c8527e18fbc64436
    parent: aaron.bentley at utoronto.ca-20060414215635-f271c593839053b3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Fri 2006-04-14 19:13:39 -0400
    message:
      Fix mark deletion
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060414215635-f271c593839053b3
    parent: aaron.bentley at utoronto.ca-20060412012715-b8e33bae91b660a0
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzrtools
    timestamp: Fri 2006-04-14 17:56:35 -0400
    message:
      Add experimental branch-mark command