/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_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-07-17 13:27:14 UTC
  • mfrom: (2624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

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