← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.py

  • Committer: Robert Collins
  • Date: 2005-10-30 00:00:09 UTC
  • mfrom: (1185.16.134)
  • Revision ID: robertc@robertcollins.net-20051030000009-9db99a338a0dfdac
Merge from Martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge.py
4
4
from bzrlib.commit import commit
5
5
from bzrlib.selftest import TestCaseInTempDir
6
6
from bzrlib.merge import merge
7
 
from bzrlib.errors import UnrelatedBranches, NoCommits
 
7
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
8
from bzrlib.revision import common_ancestor
9
9
from bzrlib.fetch import fetch
10
10
 
40
40
        fetch(from_branch=br2, to_branch=br1)
41
41
        # merge all of branch 2 into branch 1 even though they 
42
42
        # are not related.
43
 
        merge(['branch2', -1], ['branch2', 0])
 
43
        self.assertRaises(BzrCommandError, merge, ['branch2', -1], 
 
44
                          ['branch2', 0], reprocess=True, show_base=True)
 
45
        merge(['branch2', -1], ['branch2', 0], reprocess=True)
44
46
        self.assertEquals(len(br1.pending_merges()), 1)
45
47
        return (br1, br2)
46
48