← 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
72
72
        self.run_bzr('revert --no-backup')
73
73
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
74
74
        self.run_bzr('revert --no-backup')
 
75
        self.run_bzr_error(['Show-base is not supported for this merge type'],
 
76
                           'merge ../b -r last:1..last:1 --merge-type weave'
 
77
                           ' --show-base')
 
78
        self.run_bzr('revert --no-backup')
75
79
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
76
80
        self.run_bzr('revert --no-backup')
77
81
        self.run_bzr('merge ../b -r last:1')