/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: 2006-08-16 04:57:05 UTC
  • mto: This revision was merged to the branch mainline in revision 1934.
  • Revision ID: aaron.bentley@utoronto.ca-20060816045705-b4e53acd83d8acb7
Strip out all the EnumOption stuff

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', '--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
63
63
        # We can't merge when there are in-tree changes
64
64
        self.runbzr('merge ../b', retcode=3)
65
65
        self.runbzr(['commit', '-m', "Like an epidemic of u's"])
66
 
        self.runbzr('merge ../b -r last:1..last:1 --blooof',
 
66
        self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
67
67
                    retcode=3)
68
 
        self.runbzr('merge ../b -r last:1..last:1 --merge3')
 
68
        self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
69
69
        self.runbzr('revert --no-backup')
70
 
        self.runbzr('merge ../b -r last:1..last:1 --weave')
 
70
        self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
71
71
        self.runbzr('revert --no-backup')
72
72
        self.runbzr('merge ../b -r last:1..last:1 --reprocess')
73
73
        self.runbzr('revert --no-backup')