/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/blackbox/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_conflicts.py
26
26
        prefix='my'):
27
27
    this_tree = test.make_branch_and_tree(this_path)
28
28
    test.build_tree_contents([
29
 
        ('%s/%sfile' % (this_path, prefix), b'this content\n'),
30
 
        ('%s/%s_other_file' % (this_path, prefix), b'this content\n'),
 
29
        ('%s/%sfile' % (this_path, prefix), 'this content\n'),
 
30
        ('%s/%s_other_file' % (this_path, prefix), 'this content\n'),
31
31
        ('%s/%sdir/' % (this_path, prefix),),
32
32
        ])
33
33
    this_tree.add(prefix+'file')
36
36
    this_tree.commit(message="new")
37
37
    other_tree = this_tree.controldir.sprout(other_path).open_workingtree()
38
38
    test.build_tree_contents([
39
 
        ('%s/%sfile' % (other_path, prefix), b'contentsb\n'),
40
 
        ('%s/%s_other_file' % (other_path, prefix), b'contentsb\n'),
 
39
        ('%s/%sfile' % (other_path, prefix), 'contentsb\n'),
 
40
        ('%s/%s_other_file' % (other_path, prefix), 'contentsb\n'),
41
41
        ])
42
42
    other_tree.rename_one(prefix+'dir', prefix+'dir2')
43
43
    other_tree.commit(message="change")
44
44
    test.build_tree_contents([
45
 
        ('%s/%sfile' % (this_path, prefix), b'contentsa2\n'),
46
 
        ('%s/%s_other_file' % (this_path, prefix), b'contentsa2\n'),
 
45
        ('%s/%sfile' % (this_path, prefix), 'contentsa2\n'),
 
46
        ('%s/%s_other_file' % (this_path, prefix), 'contentsa2\n'),
47
47
        ])
48
48
    this_tree.rename_one(prefix+'dir', prefix+'dir3')
49
49
    this_tree.commit(message='change')