Mercurial > hg
view tests/mockblackbox.py @ 26618:8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.
The test output changes indicate the actual behavior change happening.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 11 Oct 2015 21:56:39 -0700 |
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