Mercurial > hg
view tests/mockblackbox.py @ 27089:dbb30bc16fc2
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 | 0ead0a07ed9c |
children | ac49ecb2a897 |
line wrap: on
line source
from mercurial import util def makedate(): return 0, 0 def getuser(): return 'bob' # mock the date and user apis so the output is always the same def uisetup(ui): util.makedate = makedate util.getuser = getuser