← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Robey Pointer
  • Date: 2006-09-03 00:28:18 UTC
  • mfrom: (1981 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060903002818-71ca5c7bfea93a26
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
209
209
        control.create_branch()
210
210
        tree = workingtree.WorkingTreeFormat3().initialize(control)
211
211
        tree._control_files._transport.delete("pending-merges")
212
 
        self.assertEqual([], tree.pending_merges())
 
212
        self.assertEqual([], tree.get_parent_ids())
213
213
 
214
214
 
215
215
class TestFormat2WorkingTree(TestCaseWithTransport):