Mercurial > hg
comparison mercurial/commands.py @ 27025:ec37257341a9
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.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Nov 2015 23:43:18 -0800 |
parents | f4fec0940278 |
children | dbb30bc16fc2 |
comparison
equal
deleted
inserted
replaced
27024:ceef5fb14872 | 27025:ec37257341a9 |
---|---|
5702 ui.setconfig('ui', 'forcemerge', '', 'resolve') | 5702 ui.setconfig('ui', 'forcemerge', '', 'resolve') |
5703 ms.commit() | 5703 ms.commit() |
5704 | 5704 |
5705 # replace filemerge's .orig file with our resolve file | 5705 # replace filemerge's .orig file with our resolve file |
5706 a = repo.wjoin(f) | 5706 a = repo.wjoin(f) |
5707 util.rename(a + ".resolve", a + ".orig") | 5707 try: |
5708 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a)) | |
5709 except OSError as inst: | |
5710 if inst.errno != errno.ENOENT: | |
5711 raise | |
5708 | 5712 |
5709 ms.commit() | 5713 ms.commit() |
5710 | 5714 |
5711 if not didwork and pats: | 5715 if not didwork and pats: |
5712 ui.warn(_("arguments do not match paths that need resolving\n")) | 5716 ui.warn(_("arguments do not match paths that need resolving\n")) |