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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 15:09:40 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521150940-v0kb1o7ebd9vmqjw
Fix some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/blackbox/test_conflicts.py
60
60
    def test_conflicts(self):
61
61
        self.run_script("""\
62
62
$ cd branch
63
 
$ bzr conflicts
 
63
$ brz 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
 
$ bzr conflicts --text
 
72
$ brz 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
 
$ bzr conflicts  -d branch
 
79
$ brz conflicts  -d branch
80
80
Text conflict in my_other_file
81
81
Path conflict: mydir3 / mydir2
82
82
Text conflict in myfile