##// END OF EJS Templates
update: teach hg to override untracked dir with a tracked file on update...
update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

File last commit:

r28943:417380aa default
r29480:1e4512ea default
Show More
mockblackbox.py
17 lines | 332 B | text/x-python | PythonLexer
from __future__ import absolute_import
from mercurial import (
util,
)
def makedate():
return 0, 0
def getuser():
return 'bob'
def getpid():
return 5000
# mock the date and user apis so the output is always the same
def uisetup(ui):
util.makedate = makedate
util.getuser = getuser
util.getpid = getpid