(self)
| 559 | self.assertEqual('uncommitted', utils.read_file(self.OTHER_FILE)) |
| 560 | |
| 561 | def test_conflicts_multiple(self): |
| 562 | gl.branch(c='tmp', divergent_point='HEAD~2') |
| 563 | gl.switch('tmp') |
| 564 | utils.append_to_file(self.MASTER_FILE, contents='conflict') |
| 565 | gl.commit(m='will conflict 0') |
| 566 | utils.append_to_file(self.MASTER_FILE, contents='conflict') |
| 567 | gl.commit(m='will conflict 1') |
| 568 | |
| 569 | self.assertRaisesRegexp(ErrorReturnCode, 'conflicts', gl.fuse, 'master') |
| 570 | gl.resolve(self.MASTER_FILE) |
| 571 | self.assertRaisesRegexp( |
| 572 | ErrorReturnCode, 'conflicts', gl.commit, m='ci 0 in tmp') |
| 573 | gl.resolve(self.MASTER_FILE) |
| 574 | gl.commit(m='ci 1 in tmp') # this one should finalize the fuse |
| 575 | |
| 576 | self.__assert_history( |
| 577 | self.__build('master') + self.__build('tmp', range(2))) |
| 578 | |
| 579 | def test_conflicts_multiple_uncommitted_changes(self): |
| 580 | gl.branch(c='tmp', divergent_point='HEAD~2') |
nothing calls this directly
no test coverage detected