← 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

- refactor handling of short option names

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
 
        fetcher = fetch(from_branch=bx, to_branch=by)
48
 
        self.assertEqual(1, fetcher.count_copied)
49
 
        self.assertEqual([], fetcher.failed_revisions)
 
47
        fetch(from_branch=bx, to_branch=by)
50
48
        # just having the history there does nothing
51
49
        self.assertRaises(PointlessCommit,
52
50
                          commit,
96
94
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
97
95
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
98
96
 
99
 
        check(bx, False)
100
 
        check(by, False)
 
97
        check(bx)
 
98
        check(by)