← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
44
44
    def test_merge_reprocess(self):
45
45
        d = BzrDir.create_standalone_workingtree('.')
46
46
        d.commit('h')
47
 
        self.run_bzr('merge', '.', '--reprocess', '--merge-type', 'weave')
 
47
        self.run_bzr('merge . --reprocess --merge-type weave')
48
48
 
49
49
    def test_merge(self):
50
50
        from bzrlib.branch import Branch
233
233
        tree_a.commit('commit 2')
234
234
        tree_a.rename_one('file_2', 'file_ii')
235
235
        ## os.chdir('b')
236
 
        self.run_bzr('merge', 'a', '--uncommitted', '-d', 'b')
 
236
        self.run_bzr('merge a --uncommitted -d b')
237
237
        self.failUnlessExists('b/file_1')
238
238
        self.failUnlessExists('b/file_ii')
239
239
        tree_b.revert([])
240
240
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
241
 
                           'merge', '/a', '--uncommitted', '-r1',
242
 
                           '-d', 'b')
 
241
                           'merge /a --uncommitted -r1 -d b')
243
242
 
244
243
    def pullable_branch(self):
245
244
        os.mkdir('a')
266
265
    def test_merge_pull(self):
267
266
        self.pullable_branch()
268
267
        os.chdir('a')
269
 
        (out, err) = self.run_bzr('merge', '--pull', '../b')
 
268
        (out, err) = self.run_bzr('merge --pull ../b')
270
269
        self.assertContainsRe(err, 'Now on revision 2\\.')
271
270
        tree_a = WorkingTree.open('.')
272
271
        self.assertEqual([self.id2], tree_a.get_parent_ids())
281
280
        self.build_tree(['tree_a/file/'])
282
281
        tree_a.commit('changed file to directory')
283
282
        os.chdir('tree_b')
284
 
        self.run_bzr('merge', '../tree_a')
 
283
        self.run_bzr('merge ../tree_a')
285
284
        self.assertEqual('directory', file_kind('file'))
286
285
        tree_b.revert([])
287
286
        self.assertEqual('file', file_kind('file'))
288
287
        self.build_tree_contents([('file', 'content_2')])
289
288
        tree_b.commit('content change')
290
 
        self.run_bzr('merge', '../tree_a', retcode=1)
 
289
        self.run_bzr('merge ../tree_a', retcode=1)
291
290
        self.assertEqual(tree_b.conflicts(),
292
291
                         [ContentsConflict('file', file_id='file-id')])