Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 27089:dbb30bc16fc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: record dirstate actions after performing resolutions Some resolutions might lead to pending actions we need to perform in the dirstate -- so perform them.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 15 Nov 2015 21:27:22 -0800
parents ec37257341a9
children 7a95c1e07487
comparison
equal deleted inserted replaced
27088:e2b79f57903a 27089:dbb30bc16fc2
5709 except OSError as inst: 5709 except OSError as inst:
5710 if inst.errno != errno.ENOENT: 5710 if inst.errno != errno.ENOENT:
5711 raise 5711 raise
5712 5712
5713 ms.commit() 5713 ms.commit()
5714 ms.recordactions()
5714 5715
5715 if not didwork and pats: 5716 if not didwork and pats:
5716 ui.warn(_("arguments do not match paths that need resolving\n")) 5717 ui.warn(_("arguments do not match paths that need resolving\n"))
5717 elif ms.mergedriver and ms.mdstate() != 's': 5718 elif ms.mergedriver and ms.mdstate() != 's':
5718 # run conclude step when either a driver-resolved file is requested 5719 # run conclude step when either a driver-resolved file is requested