(self)
| 508 | self.__build('master', range(2, self.COMMITS_NUMBER))) |
| 509 | |
| 510 | def test_conflicts(self): |
| 511 | def trigger_conflicts(): |
| 512 | self.assertRaisesRegexp( |
| 513 | ErrorReturnCode, 'conflicts', gl.fuse, |
| 514 | self.OTHER, e=self.commits[self.OTHER][0]) |
| 515 | |
| 516 | # Abort |
| 517 | trigger_conflicts() |
| 518 | gl.fuse('-a') |
| 519 | self.__assert_history(self.__build('master')) |
| 520 | |
| 521 | # Fix conflicts |
| 522 | trigger_conflicts() |
| 523 | gl.resolve(self.OTHER_FILE) |
| 524 | gl.commit(m='ci 1 in other') |
| 525 | self.__assert_history( |
| 526 | self.__build(self.OTHER, range(1, self.COMMITS_NUMBER)) + |
| 527 | self.__build('master')) |
| 528 | |
| 529 | def test_conflicts_switch(self): |
| 530 | gl.switch('other') |
nothing calls this directly
no test coverage detected