Mercurial > hg

annotate tests/test-update-issue1456.t @ 15281:aeeb2afcdc25 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: support multiline matches like try/except/finally - match one pattern at a time against entire file - find line containing match - sort matches by line number
author Matt Mackall <mpm@selenic.com>
date Sun, 16 Oct 2011 20:26:20 -0500
parents 4134686b83e1
children db0340f4b507
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
1 $ rm -rf a
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
2 $ hg init a
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
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
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
5 $ echo foo > foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
6 $ hg ci -qAm0
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
7 $ chmod +x foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
8 $ hg ci -m1
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
9 $ hg co -q 0
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
10 $ echo dirty > foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
11 $ hg up -c
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
12 abort: uncommitted local changes
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12279
diff changeset
13 [255]
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
14 $ hg up -q
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
15 $ cat foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
16 dirty
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
17 $ hg st -A
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
18 M foo
7569
89207edf3973 correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
19
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
20 Validate update of standalone execute bit change:
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
21
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
22 $ hg up -C 0
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
24 $ chmod -x foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
25 $ hg ci -m removeexec
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
26 nothing changed
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12279
diff changeset
27 [1]
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
28 $ hg up -C 0
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
30 $ hg up
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
32 $ hg st
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 8855
diff changeset
33