/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 breezy/tests/per_workingtree/test_get_parent_ids.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_get_parent_ids.py
42
42
        self.assertEqual([], wt.get_parent_ids())
43
43
        if not wt._format. supports_righthand_parent_id_as_ghost:
44
44
            raise TestNotApplicable(
45
 
                    'format does not support right hand side parents '
46
 
                    'that are ghosts')
 
45
                'format does not support right hand side parents '
 
46
                'that are ghosts')
47
47
        # the first pending merge replaces the 'last revision' because
48
48
        # 'last revision' is shorthand for 'left most parent'
49
49
        wt.add_pending_merge(b'foo@azkhazan-123123-abcabc')
55
55
        # order is preserved.
56
56
        wt.add_pending_merge(b'wibble@fofof--20050401--1928390812')
57
57
        self.assertEqual([b'foo@azkhazan-123123-abcabc',
58
 
            b'wibble@fofof--20050401--1928390812'],
59
 
            wt.get_parent_ids())
 
58
                          b'wibble@fofof--20050401--1928390812'],
 
59
                         wt.get_parent_ids())