Mercurial Mercurial > hg / 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 Martin von Zweigbergk <martinvonz@google.com>
Tue, 23 Mar 2021 10:12:58 -0700
changeset 46830 6648307d4fe8
parent 44977 afcad425a0b6
permissions -rw-r--r--
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
Mercurial