Rev 1474: [merge] robertc, small tests in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1474
revision-id: mbp at sourcefrog.net-20051208040047-8fdf91aa5b0047f0
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 15:00:47 +1100
message:
  [merge] robertc, small tests
added:
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051207061337-6edae828b9c29103
    parent: robertc at robertcollins.net-20051207055358-757787e694d89456
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2005-12-07 17:13:37 +1100
    message:
      Test for the number of uses of self.working_tree() in branch.py
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051207055358-757787e694d89456
    parent: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2005-12-07 16:53:58 +1100
    message:
      Test for the number of uses of self.working_tree() in branch.py
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
    parent: robertc at robertcollins.net-20051206082223-46591e053716a9ce
    parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2005-12-07 14:08:32 +1100
    message:
      Merge from mbp.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051206082223-46591e053716a9ce
    parent: robertc at robertcollins.net-20051206050437-700e48df5e094d7f
    parent: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2005-12-06 19:22:23 +1100
    message:
      Merge from mbp AGAIN.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051206050437-700e48df5e094d7f
    parent: robertc at robertcollins.net-20051205074009-ab11929b3456c4c9
    parent: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2005-12-06 16:04:37 +1100
    message:
      merge from mbp.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051205074009-ab11929b3456c4c9
    parent: robertc at robertcollins.net-20051202032347-ba08123207a945a0
    parent: mbp at sourcefrog.net-20051205032419-25f8b2e13aaabf8b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2005-12-05 18:40:09 +1100
    message:
      Merge from mbp.