← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge.py

  • Committer: Aaron Bentley
  • Date: 2005-10-04 04:32:32 UTC
  • mfrom: (1185.12.6)
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051004043231-40302a149769263b
merged my own changes

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, BzrCommandError
 
7
from bzrlib.errors import UnrelatedBranches, NoCommits
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
 
        self.assertRaises(BzrCommandError, merge, ['branch2', -1], 
44
 
                          ['branch2', 0], reprocess=True, show_base=True)
45
 
        merge(['branch2', -1], ['branch2', 0], reprocess=True)
 
43
        merge(['branch2', -1], ['branch2', 0])
46
44
        self.assertEquals(len(br1.pending_merges()), 1)
47
45
        return (br1, br2)
48
46