resolve: fix incorrect merge
The merge from stable into default was semantically incomplete -- a couple of
changes in preceding code had to be rewritten here.
This code only triggers for change/delete conflicts, so we can't test it yet.
We will soon be able to do it, though.
--- 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()