← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

bugfix from Aaron Bentley - bzrlib.graph.max_distance had an off-by-1 error

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
164
164
        self.check_file_contents('hello', 'foo')
165
165
        self.runbzr('revert hello')
166
166
        self.check_file_contents('hello', 'xyz')
 
167
        os.chdir('revertdir')
 
168
        self.runbzr('revert')
 
169
        os.chdir('..')
 
170
 
167
171
 
168
172
    def test_mv_modes(self):
169
173
        """Test two modes of operation for mv"""
211
215
        output = self.runbzr('diff -r last:3..last:1', backtick=1)
212
216
        self.assert_('\n+baz' in output)
213
217
 
 
218
    def test_branch(self):
 
219
        """Branch from one branch to another."""
 
220
        os.mkdir('a')
 
221
        os.chdir('a')
 
222
        self.example_branch()
 
223
        os.chdir('..')
 
224
        self.runbzr('branch a b')
 
225
        self.runbzr('branch a c -r 1')
 
226
 
214
227
    def test_merge(self):
215
228
        from bzrlib.branch import Branch
216
229
        
256
269
        self.runbzr('branch a b')
257
270
        os.chdir('b')
258
271
        self.runbzr('pull')
 
272
        os.mkdir('subdir')
 
273
        self.runbzr('add subdir')
259
274
        self.runbzr('commit -m blah --unchanged')
260
275
        os.chdir('../a')
261
276
        a = Branch.open('.')
270
285
        os.chdir('../a')
271
286
        self.runbzr('merge ../b')
272
287
        self.runbzr('commit -m blah4 --unchanged')
273
 
        os.chdir('../b')
274
 
        self.runbzr('pull ../a')
 
288
        os.chdir('../b/subdir')
 
289
        self.runbzr('pull ../../a')
275
290
        assert a.revision_history()[-1] == b.revision_history()[-1]
276
291
        
277
292
    def test_add_reports(self):