changeset 27025 | ec37257341a9 |
parent 27010 | f4fec0940278 |
child 27089 | dbb30bc16fc2 |
--- a/mercurial/commands.py Wed Nov 18 20:55:32 2015 +0100 +++ b/mercurial/commands.py Wed Nov 18 23:43:18 2015 -0800 @@ -5704,7 +5704,11 @@ # replace filemerge's .orig file with our resolve file a = repo.wjoin(f) - util.rename(a + ".resolve", a + ".orig") + try: + util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a)) + except OSError as inst: + if inst.errno != errno.ENOENT: + raise ms.commit()