← 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

Exclude more files from dumb-rsync upload

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,
51
53
                          by, 'no changes yet', rev_id='y@u-0-2',
52
54
                          allow_pointless=False)
53
 
        by.add_pending_merge('x@u-0-1')
 
55
        by.working_tree().add_pending_merge('x@u-0-1')
54
56
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
55
57
 
56
58
        self.assertEquals(by.revno(), 2)
78
80
        # we haven't merged the texts, but let's fake it
79
81
        shutil.copyfile('x/ecks', 'y/ecks')
80
82
        by.add(['ecks'], ['ecks-id'])
81
 
        by.add_pending_merge('x@u-0-1')
 
83
        by.working_tree().add_pending_merge('x@u-0-1')
82
84
 
83
85
        # partial commit of merges is currently not allowed, because
84
86
        # it would give different merge graphs for each file which
94
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
95
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
96
98
 
97
 
        check(bx)
98
 
        check(by)
 
99
        check(bx, False)
 
100
        check(by, False)