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.

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