Mercurial > hg
annotate tests/test-rebuildstate.t @ 23021:41770cee3c6a
test-resolve: add test resolving one of two files
The tests for resolve are missing a lot of cases. Let's start by
adding another file to the test repo, so we can test resolving one of
two files.
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Wed, 08 Oct 2014 21:07:30 -0700 |
parents | f2719b387380 |
children | ddc17eaf0f1b |
rev | line source |
---|---|
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
1 basic test for hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
2 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
3 $ hg init repo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
4 $ cd repo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
6 $ touch foo bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
7 $ hg ci -Am 'add foo bar' |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
8 adding bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
9 adding foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
11 $ touch baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
12 $ hg add baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
13 $ hg rm bar |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
15 $ hg debugrebuildstate |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
16 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
17 state dump after |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
18 |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
19 $ hg debugstate --nodates | sort |
15440
9ab2b3b730ee
windows: use umask 022 in debugstate output
Mads Kiilerich <mads@kiilerich.com>
parents:
12121
diff
changeset
|
20 n 644 -1 bar |
9ab2b3b730ee
windows: use umask 022 in debugstate output
Mads Kiilerich <mads@kiilerich.com>
parents:
12121
diff
changeset
|
21 n 644 -1 foo |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
22 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
23 status |
5065
b304c2496f52
dirstate: fix rebuild; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
24 |
12121
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
25 $ hg st -A |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
26 ! bar |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
27 ? baz |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
28 C foo |
8f258dd4ed02
tests: unify test-rebuildstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6344
diff
changeset
|
29 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15440
diff
changeset
|
30 $ cd .. |