Mercurial > hg
annotate tests/test-update-reverse.t @ 50916:98b8836d0e82
hgweb: use sysstr to set attribute on diff option
Attribute identifier should be `str` not `bytes`.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 01 Sep 2023 12:09:54 +0200 |
parents | 55c6ebd11cb9 |
children |
rev | line source |
---|---|
49621
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
44724
diff
changeset
|
1 $ hg init repo |
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
44724
diff
changeset
|
2 $ cd repo |
12279 | 3 |
4 $ touch a | |
5 $ hg add a | |
6 $ hg commit -m "Added a" | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
7 |
12279 | 8 $ touch main |
9 $ hg add main | |
10 $ hg commit -m "Added main" | |
11 $ hg checkout 0 | |
12 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
|
13 |
12279 | 14 'main' should be gone: |
15 | |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
16 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
17 .hg |
12279 | 18 a |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
19 |
12279 | 20 $ touch side1 |
21 $ hg add side1 | |
22 $ hg commit -m "Added side1" | |
23 created new head | |
24 $ touch side2 | |
25 $ hg add side2 | |
26 $ hg commit -m "Added side2" | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
27 |
12279 | 28 $ hg log |
29 changeset: 3:91ebc10ed028 | |
30 tag: tip | |
31 user: test | |
32 date: Thu Jan 01 00:00:00 1970 +0000 | |
33 summary: Added side2 | |
34 | |
35 changeset: 2:b932d7dbb1e1 | |
36 parent: 0:c2eda428b523 | |
37 user: test | |
38 date: Thu Jan 01 00:00:00 1970 +0000 | |
39 summary: Added side1 | |
40 | |
41 changeset: 1:71a760306caf | |
42 user: test | |
43 date: Thu Jan 01 00:00:00 1970 +0000 | |
44 summary: Added main | |
45 | |
46 changeset: 0:c2eda428b523 | |
47 user: test | |
48 date: Thu Jan 01 00:00:00 1970 +0000 | |
49 summary: Added a | |
50 | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
51 |
12279 | 52 $ hg heads |
53 changeset: 3:91ebc10ed028 | |
54 tag: tip | |
55 user: test | |
56 date: Thu Jan 01 00:00:00 1970 +0000 | |
57 summary: Added side2 | |
58 | |
59 changeset: 1:71a760306caf | |
60 user: test | |
61 date: Thu Jan 01 00:00:00 1970 +0000 | |
62 summary: Added main | |
63 | |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
64 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
65 .hg |
12279 | 66 a |
67 side1 | |
68 side2 | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
69 |
12279 | 70 $ hg update --debug -C 1 |
71 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18360
diff
changeset
|
72 branchmerge: False, force: True, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
12279
diff
changeset
|
73 ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf |
18360
760c0d67ce5e
merge: process files in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
74 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
|
75 removing side1 |
12279 | 76 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
|
77 removing side2 |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
78 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
|
79 getting main |
12279 | 80 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
|
81 |
44724
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
82 $ ls -A |
5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents:
25125
diff
changeset
|
83 .hg |
12279 | 84 a |
85 main | |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff
changeset
|
86 |