Mercurial > hg

annotate tests/test-up-issue1456.out @ 10564:6ded6243bde2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
alias: fixes exception when displaying translated help text __doc__ of aliased command shouldn't cointain non-ASCII characters, because it'll be gettext-ed later by commands.help_(). Here gettext can raise UnicodeDecodeError. Once concatenated two translatable strings into one, it become untranslatable. So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_, where help texts are translated. 'alias for:' was introduced by 6e8a16dd3e30.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 01 Mar 2010 23:27:44 +0900
parents f331de880cbb
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8855
f331de880cbb update: add --check option
Matt Mackall <mpm@selenic.com>
parents: 7630
diff changeset
1 abort: uncommitted local changes
7569
89207edf3973 correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
2 dirty
89207edf3973 correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
3 M foo
7630
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
4 % validate update of standalone execute bit change
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
6 nothing changed
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved