← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-20 13:59:17 UTC
  • mfrom: (1551.8.25 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
Fix deprecated use of pending_merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
81
81
        self.assertEqual([tip], wt2.get_parent_ids())
82
82
        
83
83
    def test_pending_with_null(self):
84
 
        """When base is forced to revno 0, pending_merges is set"""
 
84
        """When base is forced to revno 0, parent_ids are set"""
85
85
        wt2 = self.test_unrelated()
86
86
        wt1 = WorkingTree.open('.')
87
87
        br1 = wt1.branch