← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
29
29
 
30
30
    def setUp(self):
31
31
        super(ExternalBase, self).setUp()
32
 
        try:
33
 
            os.mkdir('a')
34
 
        except:
35
 
            raise os.getcwd()
 
32
        a_tree = self.make_branch_and_tree('a')
 
33
        self.build_tree_contents([
 
34
            ('a/myfile', 'contentsa\n'),
 
35
            ('a/my_other_file', 'contentsa\n'),
 
36
            ('a/mydir/',),
 
37
            ])
 
38
        a_tree.add('myfile')
 
39
        a_tree.add('my_other_file')
 
40
        a_tree.add('mydir')
 
41
        a_tree.commit(message="new")
 
42
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
43
        self.build_tree_contents([
 
44
            ('b/myfile', 'contentsb\n'),
 
45
            ('b/my_other_file', 'contentsb\n'),
 
46
            ])
 
47
        b_tree.rename_one('mydir', 'mydir2')
 
48
        b_tree.commit(message="change")
 
49
        self.build_tree_contents([
 
50
            ('a/myfile', 'contentsa2\n'),
 
51
            ('a/my_other_file', 'contentsa2\n'),
 
52
            ])
 
53
        a_tree.rename_one('mydir', 'mydir3')
 
54
        a_tree.commit(message='change')
 
55
        a_tree.merge_from_branch(b_tree.branch)
36
56
        os.chdir('a')
37
 
        self.run_bzr('init')
38
 
        file('myfile', 'wb').write('contentsa\n')
39
 
        file('my_other_file', 'wb').write('contentsa\n')
40
 
        os.mkdir('mydir')
41
 
        self.run_bzr('add')
42
 
        self.run_bzr('commit -m new')
43
 
        os.chdir('..')
44
 
        self.run_bzr('branch a b')
45
 
        os.chdir('b')
46
 
        file('myfile', 'wb').write('contentsb\n')
47
 
        file('my_other_file', 'wb').write('contentsb\n')
48
 
        self.run_bzr('mv mydir mydir2')
49
 
        self.run_bzr('commit -m change')
50
 
        os.chdir('../a')
51
 
        file('myfile', 'wb').write('contentsa2\n')
52
 
        file('my_other_file', 'wb').write('contentsa2\n')
53
 
        self.run_bzr('mv mydir mydir3')
54
 
        self.run_bzr('commit -m change')
55
 
        self.run_bzr('merge ../b', retcode=1)
56
57
 
57
58
    def test_conflicts(self):
58
59
        conflicts, errs = self.run_bzr('conflicts')