← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-07-04 12:22:34 UTC
  • Revision ID: mbp@sourcefrog.net-20050704122234-e35f78b10d8a009d
- Clear pending-merge list when committing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
73
73
                          'foo@azkhazan-123123-abcabc')
74
74
        self.assertEquals(rev.parents[1].revision_id,
75
75
                           'wibble@fofof--20050401--1928390812')
 
76
 
 
77
        # list should be cleared when we do a commit
 
78
        self.assertEquals(b.pending_merges(), [])
 
79
        
76
80
        
77
81
        
78
82