Mercurial > hg
annotate tests/test-locale.t @ 45587:768412472663
merge: store cases when a file is absent post merge in commitinfo
Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.
User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.
We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.
Differential Revision: https://phab.mercurial-scm.org/D9003
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 24 Aug 2020 15:35:34 +0530 |
parents | afcad425a0b6 |
children |
rev | line source |
---|---|
44977
afcad425a0b6
pycompat: fix crash when default locale is unknown
Manuel Jacob <me@manueljacob.de>
parents:
diff
changeset
|
1 $ LANG=nonexistent LC_ALL=nonexistent LANGUAGE=nonexistent hg version -q |
afcad425a0b6
pycompat: fix crash when default locale is unknown
Manuel Jacob <me@manueljacob.de>
parents:
diff
changeset
|
2 Mercurial Distributed SCM (version *) (glob) |