← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

[merge] from robert and fix up tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
44
44
        commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
45
45
        commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
46
46
 
47
 
        fetch(from_branch=bx, to_branch=by)
 
47
        fetcher = fetch(from_branch=bx, to_branch=by)
 
48
        self.assertEqual(1, fetcher.count_copied)
 
49
        self.assertEqual([], fetcher.failed_revisions)
48
50
        # just having the history there does nothing
49
51
        self.assertRaises(PointlessCommit,
50
52
                          commit,