def test_create_release_changes_active_branch_even_if_dirty_but_without_conflicts(self): gitflow = GitFlow(self.repo) mgr = ReleaseBranchManager(gitflow) # In this fixture, odd.py contains changes that would be overwritten. # Since we don't want to test this here, we revert all local changes in # odd.py, but leave the local changes in README.txt. These changes # won't be overwritten by the merge, so git-flow should be able to # create a new release branch if Git can do this self.repo.index.reset(index=True, working_tree=True, paths=['odd.py']) mgr.create('1.0') self.assertIn('release/1.0', [b.name for b in mgr.iter()])