/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: John Arbash Meinel
  • Date: 2010-11-05 20:54:32 UTC
  • mfrom: (5526 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5527.
  • Revision ID: john@arbash-meinel.com-20101105205432-rmyozu8sthyhmri8
Merge bzr.dev to resolve bzr-2.3.txt (aka NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
70
70
        out, err = self.run_bzr('conflicts --text')
71
71
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
72
72
 
 
73
    def test_conflicts_directory(self):
 
74
        """Test --directory option"""
 
75
        out, err = self.run_bzr('conflicts --directory a', working_dir='.')
 
76
        self.assertEqual(3, len(out.splitlines()))
 
77
        self.assertEqual('', err)
 
78
 
73
79
 
74
80
class TestResolve(TestConflictsBase):
75
81
 
97
103
        self.assertEqual(True, conflicts.is_empty(),
98
104
                         "tree still contains conflicts: %r" % conflicts)
99
105
 
 
106
    def test_resolve_via_directory(self):
 
107
        """resolve when run from subdirectory should handle relative paths"""
 
108
        self.build_tree(["a/subdir/"])
 
109
        self.run_bzr("resolve -d a/subdir ../myfile")
 
110
 
100
111
    def test_auto_resolve(self):
101
112
        """Text conflicts can be resolved automatically"""
102
113
        tree = self.make_branch_and_tree('tree')
113
124
        self.build_tree_contents([('tree/file', 'a\n')])
114
125
        note = self.run_bzr('resolve', working_dir='tree')[1]
115
126
        self.assertContainsRe(note, 'All conflicts resolved.')
 
127
 
 
128
    def test_resolve_all_directory(self):
 
129
        """Test --directory option"""
 
130
        out, err = self.run_bzr('resolve --all -d a', working_dir='.')
 
131
        self.assertEqual('', err)
 
132
        out, err = self.run_bzr('conflicts')
 
133
        self.assertEqual(0, len(out.splitlines()))