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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-23 22:25:11 UTC
  • mto: This revision was merged to the branch mainline in revision 7053.
  • Revision ID: jelmer@jelmer.uk-20180723222511-gns8mqohgakwa2b9
Some brz-git fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_parents.py
349
349
        """Test adding the first parent id - as a ghost"""
350
350
        tree = self.make_branch_and_tree('.')
351
351
        self.assertRaises(errors.GhostRevisionUnusableHere,
352
 
            tree.add_parent_tree, ('first-revision', None))
 
352
            tree.add_parent_tree, (b'first-revision', None))
353
353
 
354
354
    def test_add_first_parent_tree_ghost_force(self):
355
355
        """Test adding the first parent id - as a ghost"""
356
356
        tree = self.make_branch_and_tree('.')
357
357
        try:
358
 
            tree.add_parent_tree(('first-revision', None),
 
358
            tree.add_parent_tree((b'first-revision', None),
359
359
                allow_leftmost_as_ghost=True)
360
360
        except errors.GhostRevisionUnusableHere:
361
361
            self.assertFalse(tree._format.supports_leftmost_parent_id_as_ghost)
362
362
        else:
363
363
            self.assertTrue(tree._format.supports_leftmost_parent_id_as_ghost)
364
 
            self.assertConsistentParents(['first-revision'], tree)
 
364
            self.assertConsistentParents([b'first-revision'], tree)
365
365
 
366
366
    def test_add_second_parent_tree(self):
367
367
        """Test adding the second parent id"""
378
378
        tree = self.make_branch_and_tree('.')
379
379
        first_revision = tree.commit('first post')
380
380
        if tree._format.supports_righthand_parent_id_as_ghost:
381
 
            tree.add_parent_tree(('second', None))
382
 
            self.assertConsistentParents([first_revision, 'second'], tree)
 
381
            tree.add_parent_tree((b'second', None))
 
382
            self.assertConsistentParents([first_revision, b'second'], tree)
383
383
        else:
384
384
            self.assertRaises(errors.GhostRevisionUnusableHere,
385
 
                    tree.add_parent_tree, ('second', None))
 
385
                    tree.add_parent_tree, (b'second', None))
386
386
 
387
387
 
388
388
class UpdateToOneParentViaDeltaTests(TestCaseWithWorkingTree):