← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
22
22
from bzrlib.branch import Branch
23
23
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
24
24
from bzrlib.tests.test_revision import make_branches
25
 
from bzrlib.fetch import fetch
26
25
from bzrlib.check import check
27
26
 
28
27
 
43
42
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
44
43
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
45
44
 
46
 
        fetcher = fetch(from_branch=bx, to_branch=by)
47
 
        self.assertEqual(1, fetcher.count_copied)
48
 
        self.assertEqual([], fetcher.failed_revisions)
 
45
        self.assertEqual((1, []), by.fetch(bx))
49
46
        # just having the history there does nothing
50
47
        self.assertRaises(PointlessCommit,
51
48
                          wty.commit,
76
73
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
77
74
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
78
75
 
79
 
        fetch(from_branch=bx, to_branch=by)
 
76
        by.fetch(bx)
80
77
        # we haven't merged the texts, but let's fake it
81
78
        shutil.copyfile('x/ecks', 'y/ecks')
82
79
        wty.add(['ecks'], ['ecks-id'])