mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
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.
This commit is contained in:
parent
616740cead
commit
5380ac35da
@ -5704,7 +5704,11 @@ def resolve(ui, repo, *pats, **opts):
|
||||
|
||||
# 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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user