/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_get_parent_ids.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
34
34
        self.assertEqual([rev1_id, rev2_id], t.get_parent_ids())
35
35
 
36
36
    def test_pending_merges(self):
37
 
        """Test the correspondence between pending merges and get_parent_ids."""
 
37
        """Test the correspondence between set pending merges and get_parent_ids."""
38
38
        wt = self.make_branch_and_tree('.')
39
39
        self.assertEqual([], wt.get_parent_ids())
40
 
        self.assertEqual([], wt.pending_merges())
41
40
        # the first pending merge replaces the 'last revision' because
42
41
        # 'last revision' is shorthand for 'left most parent'
43
42
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
44
 
        self.assertEqual([], wt.pending_merges())
45
43
        self.assertEqual(['foo@azkhazan-123123-abcabc'], wt.get_parent_ids())
46
44
        # adding a merge which is already in the parents list gets ignored.
47
45
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
48
 
        self.assertEqual([], wt.pending_merges())
49
46
        self.assertEqual(['foo@azkhazan-123123-abcabc'], wt.get_parent_ids())
50
47
        # adding a different merge results in it being appended to the list -
51
48
        # order is preserved.
53
50
        self.assertEqual(['foo@azkhazan-123123-abcabc',
54
51
            'wibble@fofof--20050401--1928390812'],
55
52
            wt.get_parent_ids())
56
 
        self.assertEqual(['wibble@fofof--20050401--1928390812'],
57
 
            wt.pending_merges())