/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 bzrlib import (
 
17
from breezy import (
18
18
    conflicts,
19
19
    tests,
20
20
    workingtree,
21
21
    )
22
 
from bzrlib.tests import script, features
 
22
from breezy.tests import script, features
23
23
 
24
24
 
25
25
def make_tree_with_conflicts(test, this_path='this', other_path='other',
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
120
120
    encoding = "ascii"
121
121
 
122
122
    def setUp(self):
123
 
        self.skip("Need to decide if replacing is the desired behaviour")
 
123
        self.skipTest("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")