def test_merge_ff(self): contents = [{'A': '1'}] branch_contents = [{'A': '2'}] commits = self.create_repo(contents) subject.checkout(self.scratch, branch_name='newbranch') branch_commits = self.create_commits(branch_contents) subject.checkout(self.scratch, 'master') subject.merge(self.scratch, 'newbranch', ff_only=True) self.assertEqual(branch_commits[0], subject.get_rev(self.scratch, id='master')) self.assertEqual(1, len(subject.find_parents(self.scratch, 'master')))
def test_cherry_pick_commit_is_merge_commit(self): contents = [{'A': '1', 'B': '2'}] commits = self.create_repo(contents) subject.checkout(self.scratch, branch_name='newbranch', tracking='master') subject.checkout(self.scratch, branch_name='pr_branch', tracking='master') pr_contents = [{'C': '3'}] pr_commits = self.create_commits(pr_contents) subject.checkout(self.scratch, 'master') subject.merge(self.scratch, 'pr_branch', no_ff=True) merge_commit = subject.get_rev(self.scratch) self.assertEqual(sorted([pr_commits[0], commits[-1]]), sorted(subject.find_parents(self.scratch, merge_commit))) branch_commit = subject.cherry_pick(self.scratch, merge_commit, 'newbranch') self.assertTrue(subject.commit_on_branch(self.scratch, branch_commit, 'newbranch')) self.assertFalse(subject.commit_on_branch(self.scratch, branch_commit, 'master'))
def test_merge_non_ff(self): contents = [{'A': '1'}] branch_contents = [{'A': '2'}] new_master_contents = [{'A': '4'}] commits = self.create_repo(contents) subject.checkout(self.scratch, branch_name='newbranch') branch_commits = self.create_commits(branch_contents) subject.checkout(self.scratch, 'master') new_master_commits = self.create_commits(new_master_contents) with self.assertRaises(subject.GitError): subject.merge(self.scratch, 'newbranch', ff_only=True) #subject.reset(self.scratch) subject.merge(self.scratch, 'newbranch', ff_only=False, strategy='ours') self.assertEqual(2, len(subject.find_parents(self.scratch, 'master')))