← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Robert Collins
  • Date: 2005-08-24 06:53:07 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050824065307-bca8ae89734a53f8
merge from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
73
73
 
74
74
 
75
75
class PendingMerges(InTempDir):
 
76
 
76
77
    def test_pending_merges(self):
77
78
        """Tracking pending-merged revisions."""
78
79
        b = Branch('.', init=True)
 
80
 
79
81
        self.assertEquals(b.pending_merges(), [])
80
82
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
81
83
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])