/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Aaron Bentley
  • Date: 2006-04-12 05:50:57 UTC
  • mto: This revision was merged to the branch mainline in revision 1655.
  • Revision ID: aaron.bentley@utoronto.ca-20060412055057-a0679e57841da975
Be robust when merge_hash file_id not in inventory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
579
579
        merge_modified = this.wt.merge_modified()
580
580
        self.assertSubset(merge_modified, modified)
581
581
        self.assertEqual(len(merge_modified), len(modified))
 
582
        this.wt.remove('b')
 
583
        this.wt.revert([])
582
584
 
583
585
    def test_file_merge(self):
584
586
        if not has_symlinks():