(self)
| 737 | self.__assert_resolve_fp(FP_IN_CONFLICT, DIR_FP_IN_CONFLICT) |
| 738 | |
| 739 | def test_resolve_relative(self): |
| 740 | self.__assert_resolve_fp(DIR_FP_IN_CONFLICT) |
| 741 | os.chdir(DIR) |
| 742 | st = self.curr_b.status_file(DIR_FP_IN_CONFLICT) |
| 743 | self.assertFalse(st.in_conflict) |
| 744 | self.assertRaisesRegexp( |
| 745 | ValueError, 'no conflicts', |
| 746 | self.curr_b.resolve_file, DIR_FP_IN_CONFLICT) |
| 747 | |
| 748 | |
| 749 | # Unit tests for branch related operations |
nothing calls this directly
no test coverage detected