← 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: Canonical.com Patch Queue Manager
  • Date: 2007-08-06 04:01:04 UTC
  • mfrom: (2665.2.1 nameerror-in-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20070806040104-af06p8gf7bsb3eze
(robertc) Merge Michael Hudson's merge --weave --show-base error output fix. (Michael Hudson)

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')