Mercurial > hg
annotate tests/test-up-issue1456.out @ 10536:093008fc4078 stable
i18n-ja: synchronized with eddf859343de
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 24 Feb 2010 15:02:06 +0900 |
parents | f331de880cbb |
children |
rev | line source |
---|---|
8855 | 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 |