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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from breezy import (
 
17
from bzrlib import (
18
18
    conflicts,
19
19
    tests,
20
20
    workingtree,
21
21
    )
22
 
from breezy.tests import script, features
 
22
from bzrlib.tests import script, features
23
23
 
24
24
 
25
25
def make_tree_with_conflicts(test, this_path='this', other_path='other',
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')
34
34
    this_tree.add(prefix+'_other_file')
35
35
    this_tree.add(prefix+'dir')
36
36
    this_tree.commit(message="new")
37
 
    other_tree = this_tree.controldir.sprout(other_path).open_workingtree()
 
37
    other_tree = this_tree.bzrdir.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')
60
60
    def test_conflicts(self):
61
61
        self.run_script("""\
62
62
$ cd branch
63
 
$ brz conflicts
 
63
$ bzr conflicts
64
64
Text conflict in my_other_file
65
65
Path conflict: mydir3 / mydir2
66
66
Text conflict in myfile
69
69
    def test_conflicts_text(self):
70
70
        self.run_script("""\
71
71
$ cd branch
72
 
$ brz conflicts --text
 
72
$ bzr conflicts --text
73
73
my_other_file
74
74
myfile
75
75
""")
76
76
 
77
77
    def test_conflicts_directory(self):
78
78
        self.run_script("""\
79
 
$ brz conflicts  -d branch
 
79
$ bzr conflicts  -d branch
80
80
Text conflict in my_other_file
81
81
Path conflict: mydir3 / mydir2
82
82
Text conflict in myfile
120
120
    encoding = "ascii"
121
121
 
122
122
    def setUp(self):
123
 
        self.skipTest("Need to decide if replacing is the desired behaviour")
 
123
        self.skip("Need to decide if replacing is the desired behaviour")
124
124
 
125
125
    def _as_output(self, text):
126
126
        return text.encode(self.encoding, "replace")