/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_remerge.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_remerge.py
69
69
        os.unlink('question.OTHER')
70
70
 
71
71
        self.run_bzr_error(['jello is not versioned'],
72
 
                     'remerge', 'jello', '--weave')
 
72
                     'remerge', 'jello', '--merge-type', 'weave')
73
73
        self.run_bzr_error(['conflicts encountered'],
74
 
                           'remerge', 'hello', '--weave',
 
74
                           'remerge', 'hello', '--merge-type', 'weave',
75
75
                           retcode=1)
76
76
 
77
77
        self.failUnlessExists('hello.OTHER')
82
82
                           'file-id', 'hello.THIS')
83
83
 
84
84
        self.run_bzr_error(['conflicts encountered'],
85
 
                           'remerge', '--weave', retcode=1)
 
85
                           'remerge', '--merge-type', 'weave', retcode=1)
86
86
 
87
87
        self.failUnlessExists('hello.OTHER')
88
88
        self.failIfExists('hello.BASE')
90
90
        self.assertFalse('hi world' in conflict_text)
91
91
 
92
92
        self.run_bzr_error(['Showing base is not supported.*Weave'],
93
 
                           'remerge', '.', '--weave', '--show-base')
 
93
                           'remerge', '.', '--merge-type', 'weave', '--show-base')
94
94
        self.run_bzr_error(['Can\'t reprocess and show base'],
95
95
                           'remerge', '.', '--show-base', '--reprocess')
96
96
        self.run_bzr_error(['conflicts encountered'],
97
 
                           'remerge', '.', '--weave', '--reprocess',
 
97
                           'remerge', '.', '--merge-type', 'weave', '--reprocess',
98
98
                           retcode=1)
99
99
        self.run_bzr_error(['conflicts encountered'],
100
100
                           'remerge', 'hello', '--show-base',