comparison mercurial/commands.py @ 17668:28c43957f8b4

resolve: commit the changes after each item resolve (issue3638) At the moment the resolve command doesn't save progress during the resolve process. In example if you try to resolve 100 conflicting files and interrupt the process (e.g., you close the external merge tool) after resolving 50 files you'll end up with 100 unresolved conflicts. Saving the progress helps a lot with long going merges. It's easy to achieve same behavior with simple script that calls resolve command for each unresolved file but it makes sense to make such behavior a default
author Sergey Kishchenko <voidwrk@gmail.com>
date Tue, 25 Sep 2012 20:50:40 +0300
parents 31f32a96e1e3
children 6e4b962600a3
comparison
equal deleted inserted replaced
17667:2b6a795f19f7 17668:28c43957f8b4
4961 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) 4961 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4962 if ms.resolve(f, wctx, mctx): 4962 if ms.resolve(f, wctx, mctx):
4963 ret = 1 4963 ret = 1
4964 finally: 4964 finally:
4965 ui.setconfig('ui', 'forcemerge', '') 4965 ui.setconfig('ui', 'forcemerge', '')
4966 ms.commit()
4966 4967
4967 # replace filemerge's .orig file with our resolve file 4968 # replace filemerge's .orig file with our resolve file
4968 util.rename(a + ".resolve", a + ".orig") 4969 util.rename(a + ".resolve", a + ".orig")
4969 4970
4970 ms.commit() 4971 ms.commit()