Mercurial > hg

annotate tests/test-up-issue1456.out @ 10843:b91c1804008e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: directly parse templates, no regexes
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Apr 2010 14:33:41 -0500
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