| 706 | class TestFileResolve(TestFile): |
| 707 | |
| 708 | def setUp(self): |
| 709 | super(TestFileResolve, self).setUp() |
| 710 | |
| 711 | # Generate a conflict |
| 712 | git.checkout(b='branch') |
| 713 | utils_lib.write_file(FP_IN_CONFLICT, contents='branch') |
| 714 | utils_lib.write_file(DIR_FP_IN_CONFLICT, contents='branch') |
| 715 | git.add(FP_IN_CONFLICT, DIR_FP_IN_CONFLICT) |
| 716 | git.commit(FP_IN_CONFLICT, DIR_FP_IN_CONFLICT, m='branch') |
| 717 | git.checkout('master') |
| 718 | utils_lib.write_file(FP_IN_CONFLICT, contents='master') |
| 719 | utils_lib.write_file(DIR_FP_IN_CONFLICT, contents='master') |
| 720 | git.add(FP_IN_CONFLICT, DIR_FP_IN_CONFLICT) |
| 721 | git.commit(FP_IN_CONFLICT, DIR_FP_IN_CONFLICT, m='master') |
| 722 | git.merge('branch', _ok_code=[1]) |
| 723 | |
| 724 | @assert_no_side_effects(TRACKED_FP) |
| 725 | def test_resolve_fp_with_no_conflicts(self): |