Mercurial > hg
annotate tests/test-revert-unknown.t @ 47890:3853e6ee160d
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
All the other caller goes through `reset_state`, so we can safely have an
explicit method on `DirstateItem` object.
This means that all the logic to preserve the previous state (from p2, merged,
etc) is now properly encapsulated within the DirstateItem. This pave the way to
using different storage for these information.
Differential Revision: https://phab.mercurial-scm.org/D11315
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Aug 2021 11:27:01 +0200 |
parents | 5c2a4f37eace |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
1 $ hg init |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
2 $ touch unknown |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
3 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
4 $ touch a |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
5 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12111
diff
changeset
|
6 $ hg ci -m "1" |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
7 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
8 $ touch b |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
9 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12111
diff
changeset
|
10 $ hg ci -m "2" |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
11 |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
12 Should show unknown |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
13 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
14 $ hg status |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
15 ? unknown |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
16 $ hg revert -r 0 --all |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
17 removing b |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
18 |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
19 Should show unknown and b removed |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
20 |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
21 $ hg status |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
22 R b |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
23 ? unknown |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
24 |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
25 Should show a and unknown |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
26 |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
12156
diff
changeset
|
27 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
12156
diff
changeset
|
28 .hg |
12111
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
29 a |
327dee7f7327
tests: unify test-revert-unknown
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
2982
diff
changeset
|
30 unknown |