(self)
| 617 | self.__assert_history(self.__build('master')) |
| 618 | |
| 619 | def test_uncommitted_changes(self): |
| 620 | utils.write_file(self.MASTER_FILE, contents='uncommitted') |
| 621 | utils.write_file('master_untracked', contents='uncommitted') |
| 622 | gl.fuse(self.OTHER) |
| 623 | self.assertEqual('uncommitted', utils.read_file(self.MASTER_FILE)) |
| 624 | self.assertEqual('uncommitted', utils.read_file('master_untracked')) |
| 625 | |
| 626 | def test_uncommitted_tracked_changes_that_conflict(self): |
| 627 | gl.branch(c='tmp', divergent_point='HEAD~1') |