← 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

  • Committer: John Arbash Meinel
  • Date: 2008-10-02 16:56:01 UTC
  • mto: This revision was merged to the branch mainline in revision 3763.
  • Revision ID: john@arbash-meinel.com-20081002165601-gx13duszt9c425ec
Merge returns code 1 to indicate there were conflicts.

I didn't notice because I had an older qbzr installed which suppressed
all returncodes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
123
123
        tree, other = self.create_conflicting_branches()
124
124
        # The default merge algorithm should enable 'reprocess' because
125
125
        # 'show-base' is not set
126
 
        self.run_bzr('merge ../other', working_dir='tree')
 
126
        self.run_bzr('merge ../other', working_dir='tree',
 
127
                     retcode=1)
127
128
        self.assertEqualDiff('a\n'
128
129
                             'B\n'
129
130
                             '<<<<<<< TREE\n'
143
144
    def test_merge_override_reprocess(self):
144
145
        tree, other = self.create_conflicting_branches()
145
146
        # Explicitly disable reprocess
146
 
        self.run_bzr('merge ../other --no-reprocess', working_dir='tree')
 
147
        self.run_bzr('merge ../other --no-reprocess', working_dir='tree',
 
148
                     retcode=1)
147
149
        self.assertEqualDiff('a\n'
148
150
                             '<<<<<<< TREE\n'
149
151
                             'B\n'
157
159
    def test_merge_override_show_base(self):
158
160
        tree, other = self.create_conflicting_branches()
159
161
        # Setting '--show-base' will auto-disable '--reprocess'
160
 
        self.run_bzr('merge ../other --show-base', working_dir='tree')
 
162
        self.run_bzr('merge ../other --show-base', working_dir='tree',
 
163
                     retcode=1)
161
164
        self.assertEqualDiff('a\n'
162
165
                             '<<<<<<< TREE\n'
163
166
                             'B\n'