Mercurial > hg
annotate tests/test-update-reverse.t @ 47737:e0e69a7d7af8
sparse: use `update_file` instead of `normallookup` in refreshwdir
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11179
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 19 Jul 2021 01:59:09 +0200 |
parents | 5c2a4f37eace |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
12279 | 1 $ hg init |
2 | |
3 $ touch a | |
4 $ hg add a | |
5 $ hg commit -m "Added a" | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
6 |
12279 | 7 $ touch main |
8 $ hg add main | |
9 $ hg commit -m "Added main" | |
10 $ hg checkout 0 | |
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
12 |
12279 | 13 'main' should be gone: |
14 | |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
15 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
16 .hg |
12279 | 17 a |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
18 |
12279 | 19 $ touch side1 |
20 $ hg add side1 | |
21 $ hg commit -m "Added side1" | |
22 created new head | |
23 $ touch side2 | |
24 $ hg add side2 | |
25 $ hg commit -m "Added side2" | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
26 |
12279 | 27 $ hg log |
28 changeset: 3:91ebc10ed028 | |
29 tag: tip | |
30 user: test | |
31 date: Thu Jan 01 00:00:00 1970 +0000 | |
32 summary: Added side2 | |
33 | |
34 changeset: 2:b932d7dbb1e1 | |
35 parent: 0:c2eda428b523 | |
36 user: test | |
37 date: Thu Jan 01 00:00:00 1970 +0000 | |
38 summary: Added side1 | |
39 | |
40 changeset: 1:71a760306caf | |
41 user: test | |
42 date: Thu Jan 01 00:00:00 1970 +0000 | |
43 summary: Added main | |
44 | |
45 changeset: 0:c2eda428b523 | |
46 user: test | |
47 date: Thu Jan 01 00:00:00 1970 +0000 | |
48 summary: Added a | |
49 | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
50 |
12279 | 51 $ hg heads |
52 changeset: 3:91ebc10ed028 | |
53 tag: tip | |
54 user: test | |
55 date: Thu Jan 01 00:00:00 1970 +0000 | |
56 summary: Added side2 | |
57 | |
58 changeset: 1:71a760306caf | |
59 user: test | |
60 date: Thu Jan 01 00:00:00 1970 +0000 | |
61 summary: Added main | |
62 | |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
63 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
64 .hg |
12279 | 65 a |
66 side1 | |
67 side2 | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
68 |
12279 | 69 $ hg update --debug -C 1 |
70 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18360
diff
changeset
|
71 branchmerge: False, force: True, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
12279
diff
changeset
|
72 ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf |
18360
760c0d67ce5e
merge: process files in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
73 side1: other deleted -> r |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
74 removing side1 |
12279 | 75 side2: other deleted -> r |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
76 removing side2 |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
77 main: remote created -> g |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
78 getting main |
12279 | 79 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
80 |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
81 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
82 .hg |
12279 | 83 a |
84 main | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
85 |