/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/workingtree_implementations/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2006-06-27 00:52:14 UTC
  • mto: (1711.2.66 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1819.
  • Revision ID: jelmer@samba.org-20060627005214-ada07acfa15484b7
Catch right exception to detect pending-merges file is missing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_workingtree.py
477
477
        self.assertEqual('foo', tree.last_revision())
478
478
        self.assertEqual('foo', tree.branch.last_revision())
479
479
 
 
480
    def test_missing_pending_merges(self):
 
481
        master_tree = self.make_branch_and_tree('master')
 
482
        tree = self.make_branch_and_tree('tree')
 
483
        tree._control_files._transport.delete("pending-merges")
 
484
        self.assertEqual([], tree.pending_merges())
 
485
 
480
486
    def test_update_turns_local_commit_into_merge(self):
481
487
        # doing an update with a few local commits and no master commits
482
488
        # makes pending-merges.