Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-locale.t
author Pulkit Goyal <7895pulkit@gmail.com>
Wed, 09 Sep 2020 16:49:19 +0530
changeset 45530 6877b0ee5f9d
parent 44821 afcad425a0b6
permissions -rw-r--r--
mergestate: introduce a new ACTION_KEEP_NEW `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this KEEP, what was the state of things. In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files which are kept absent in the working directory. There is another special case where we keep the file when it's not present on both ancestor and remote side. We introduce a dedicated action for that. The goal is to use these information to make bid merge smarter. Differential Revision: https://phab.mercurial-scm.org/D9002
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
44821
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)
hg-stable