/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

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py
1
 
# (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
32
32
        self.assertEqual([rev2_id], t2.get_parent_ids())
33
33
        t.merge_from_branch(t2.branch)
34
34
        self.assertEqual([rev1_id, rev2_id], t.get_parent_ids())
 
35
        for parent_id in t.get_parent_ids():
 
36
            self.assertIsInstance(parent_id, str)
35
37
 
36
38
    def test_pending_merges(self):
37
39
        """Test the correspondence between set pending merges and get_parent_ids."""