Mercurial > hg
annotate tests/test-update-issue1456.t @ 12298:f254204d8b8d
tests: unify test-rename-merge1
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Tue, 14 Sep 2010 13:43:05 +0200 |
parents | 28e2e3804f2e |
children | 4134686b83e1 |
rev | line source |
---|---|
12279 | 1 $ rm -rf a |
2 $ hg init a | |
3 $ cd a | |
7569
89207edf3973
correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
4 |
12279 | 5 $ echo foo > foo |
6 $ hg ci -qAm0 | |
7 $ chmod +x foo | |
8 $ hg ci -m1 | |
9 $ hg co -q 0 | |
10 $ echo dirty > foo | |
11 $ hg up -c | |
12 abort: uncommitted local changes | |
13 $ hg up -q | |
14 $ cat foo | |
15 dirty | |
16 $ hg st -A | |
17 M foo | |
7569
89207edf3973
correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
18 |
12279 | 19 Validate update of standalone execute bit change: |
20 | |
21 $ hg up -C 0 | |
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 $ chmod -x foo | |
24 $ hg ci -m removeexec | |
25 nothing changed | |
26 $ hg up -C 0 | |
27 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 $ hg up | |
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 $ hg st | |
31 |