Rev 1484: [merge] robertc, source-examination test in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1484
revision-id: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
parent: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:12:17 +1100
message:
  [merge] robertc, source-examination test
modified:
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
    parent: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2005-12-13 09:34:21 +1100
    message:
      Bugfix to source testing logic to get the right path when .py is returned by __file__
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
    parent: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
    parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2005-12-13 09:07:50 +1100
    message:
      Merge from mbp.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
    parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2005-12-08 16:57:00 +1100
    message:
      Test the uses of WorkingTree from branch.py