annotate tests/test-evolve-templates.t @ 3419:1e2f683e11e7 mercurial-4.2

test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Jan 2018 04:38:04 +0100
parents f089741039e5 85cdce113c2c
children b21a3753255f 7a5c3175015e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1 This test file test the various templates for precursors and successors.
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
3 Global setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
4 ============
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
5
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
6 $ . $TESTDIR/testlib/common.sh
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
7 $ cat >> $HGRCPATH <<EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
8 > [ui]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
9 > interactive = true
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
10 > [phases]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
11 > publish=False
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
12 > [extensions]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
13 > evolve =
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
14 > [alias]
2497
1e9b86ed78c9 template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2496
diff changeset
15 > tlog = log -G -T '{node|short}\
1e9b86ed78c9 template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2496
diff changeset
16 > {if(precursors, "\n Precursors: {precursors}")}\
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\
2498
b765650b37ee template: skip "successors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2497
diff changeset
18 > {if(successors, "\n Successors: {successors}")}\
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\
2629
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n'
9c0f6b85c28f obsfate: improve obsfate output
Boris Feld <boris.feld@octobus.net>
parents: 2613
diff changeset
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}'
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n'
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
23 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
24
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
25 Test templates on amended commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
26 ================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
27
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
28 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
29 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
30
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
31 $ hg init $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
32 $ cd $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
33 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
34 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
35 $ echo 42 >> A0
3049
02c4a0b550ab obsfate: update test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
36 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
2589
8412b0b7b512 obsfate: build more advanced markers for tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2555
diff changeset
37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
38 $ hg log --hidden -G
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
39 @ changeset: 4:d004c8f274b9
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
40 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
41 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
42 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
43 | date: Thu Jan 01 00:00:00 1970 +0000
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
44 | summary: A2
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
45 |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
46 | x changeset: 3:a468dc9b3633
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
47 |/ parent: 0:ea207398892e
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
48 | user: test
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
49 | date: Thu Jan 01 00:00:00 1970 +0000
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
50 | summary: A1
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
51 |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
52 | x changeset: 2:f137d23bb3e1
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
53 | | user: test
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
54 | | date: Thu Jan 01 00:00:00 1970 +0000
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
55 | | summary: temporary amend commit for 471f378eab4c
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
56 | |
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
57 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
58 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
59 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
60 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
61 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
62 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
63 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
64 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
65 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
66
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
67 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
68 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
69 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
70 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
71 working directory parent is obsolete! (471f378eab4c)
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
72 (use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
73
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
74 Precursors template should show current revision as it is the working copy
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
75 $ hg olog tip
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
76 o d004c8f274b9 (4) A2
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
77 |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
78 x a468dc9b3633 (3) A1
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
79 | rewritten(description) as d004c8f274b9 by test2 (*) (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
80 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
81 @ 471f378eab4c (1) A0
3108
9c9c8c1eeb93 test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3106 3001
diff changeset
82 rewritten(description, content) as a468dc9b3633 by test (*) (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
83
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
84 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
85 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
86 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
87 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
88 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
89 |/ Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
90 | semi-colon: [d004c8f274b9]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
91 | Fate: rewritten as d004c8f274b9 by test, test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
92 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
93 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
94
3050
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
95
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
96 $ hg log -G
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
97 o changeset: 4:d004c8f274b9
3050
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
98 | tag: tip
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
99 | parent: 0:ea207398892e
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
100 | user: test
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
101 | date: Thu Jan 01 00:00:00 1970 +0000
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
102 | summary: A2
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
103 |
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
104 | @ changeset: 1:471f378eab4c
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
105 |/ user: test
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
106 | date: Thu Jan 01 00:00:00 1970 +0000
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
107 | summary: A0
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
108 |
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
109 o changeset: 0:ea207398892e
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
110 user: test
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
111 date: Thu Jan 01 00:00:00 1970 +0000
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
112 summary: ROOT
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
113
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
114
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
115 $ hg fatelog -q
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
116 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
117 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
118 | @ 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
119 |/ Obsfate: rewritten as d004c8f274b9
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
120 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
121 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
122
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
123
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
124 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
125 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
126 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
127 | @ 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
128 |/ Obsfate: rewritten as d004c8f274b9 by test, test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
129 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
130 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
131
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
132 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
133 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
134 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
135 | @ 471f378eab4c
3108
9c9c8c1eeb93 test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3106 3001
diff changeset
136 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
137 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
138 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
139
2599
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
140
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
141 (check json)
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
142
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
143 $ hg log -GT '{precursors|json}\n'
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
144 o ["471f378eab4c5e25f6c77f785b27c936efb22874"]
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
145 |
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
146 | @ []
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
147 |/
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
148 o []
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
149
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
150
2602
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
151 $ hg log -GT '{successors|json}\n'
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
152 o ""
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
153 |
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
154 | @ [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
155 |/
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
156 o ""
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
157
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
158
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
159 $ hg up 'desc(A1)' --hidden
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
160 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
161 working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
162 (use 'hg evolve' to update to its successor: d004c8f274b9)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
163
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
164 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
165 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
166 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
167 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
168 | semi-colon: a468dc9b3633
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
169 | @ a468dc9b3633
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
170 |/ Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
171 | semi-colon: [d004c8f274b9]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
172 | Fate: reworded as d004c8f274b9 by test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
173 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
174 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
175
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
176 Precursors template should show the precursor as we force its display with
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
177 --hidden
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
178 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
179 o d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
180 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
181 | semi-colon: a468dc9b3633
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
182 | @ a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
183 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
184 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
185 | Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
186 | semi-colon: [d004c8f274b9]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
187 | Fate: reworded as d004c8f274b9 by test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
188 |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
189 | x f137d23bb3e1
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
190 | | Fate: pruned
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
191 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
192 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
193 |/ Successors: [a468dc9b3633]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
194 | semi-colon: [a468dc9b3633]
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
195 | Fate: rewritten as a468dc9b3633
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
196 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
197 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
198
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
199 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
200 o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
201 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
202 | @ a468dc9b3633
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
203 |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
204 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
205 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
206
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
207 $ hg up 'desc(A2)'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
209 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
210 @ d004c8f274b9
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
211 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
212 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
213
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
214 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
215 @ d004c8f274b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
216 | Precursors: a468dc9b3633
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
217 | semi-colon: a468dc9b3633
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
218 | x a468dc9b3633
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
219 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
220 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
221 | Successors: [d004c8f274b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
222 | semi-colon: [d004c8f274b9]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
223 | Fate: reworded as d004c8f274b9 by test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
224 |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
225 | x f137d23bb3e1
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
226 | | Fate: pruned
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
227 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
228 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
229 |/ Successors: [a468dc9b3633]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
230 | semi-colon: [a468dc9b3633]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
231 | Fate: rewritten as a468dc9b3633
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
232 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
233 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
234
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
235 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
236 @ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
237 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
238 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
239
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
240
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
241 $ hg fatelog -v --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
242 @ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
243 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
244 | x a468dc9b3633
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
245 |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
246 |
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
247 | x f137d23bb3e1
3108
9c9c8c1eeb93 test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3106 3001
diff changeset
248 | | Obsfate: pruned by test (at *) (glob)
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
249 | |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
250 | x 471f378eab4c
3108
9c9c8c1eeb93 test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3106 3001
diff changeset
251 |/ Obsfate: rewritten as a468dc9b3633 by test (*) (glob)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
252 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
253 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
254
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
255
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
256 $ hg fatelogjson --hidden
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
257 @ d004c8f274b9 []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
258 |
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
259 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
260 |/
3108
9c9c8c1eeb93 test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3106 3001
diff changeset
261 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob)
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
262 | |
3108
9c9c8c1eeb93 test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3106 3001
diff changeset
263 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
264 |/
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
265 o ea207398892e []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
266
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
267
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
268 Test templates with splitted commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
269 ===================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
270
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
271 $ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
272 $ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
273 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
274 $ echo 42 >> a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
275 $ echo 43 >> b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
276 $ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
277 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
278 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
279 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
280 @ changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
281 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
282 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
283 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
284 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
285 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
286 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
287 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
288 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
289 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
290
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
291 $ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
292 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
293 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
294 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
295 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
296 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
297 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
298 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
299 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
300 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
301 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
302 diff --git a/a b/a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
303 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
304 examine changes to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
305
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
306 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
307 +42
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
308 record change 1/2 to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
309
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
310 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
311 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
312 examine changes to 'b'? [Ynesfdaq?] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
313
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
314 created new head
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
315 Done splitting? [yN] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
316 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
317 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
318 examine changes to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
319
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
320 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
321 +43
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
322 record this change to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
323
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
324 no more change to split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
325
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
326 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
327 @ changeset: 3:f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
328 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
329 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
330 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
331 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
332 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
333 o changeset: 2:337fec4d2edc
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
334 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
335 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
336 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
337 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
338 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
339 | x changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
340 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
341 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
342 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
343 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
344 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
345 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
346 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
347 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
348
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
349
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
350 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
351 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
352
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
353 $ hg up 'obsolete()' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
354 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
355 working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
356 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
357
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
358 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
359 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
360 o f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
361 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
362 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
363 o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
364 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
365 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
366 | @ 471597cad322
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
367 |/ Successors: [337fec4d2edc, f257fde29c7a]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
368 | semi-colon: [337fec4d2edc, f257fde29c7a]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
369 | Fate: split as 337fec4d2edc, f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
370 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
371 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
372
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
373 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
374 o f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
375 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
376 o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
377 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
378 | @ 471597cad322
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
379 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
380 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
381 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
382
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
383
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
384 $ hg up f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
385 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
386
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
387 Precursors template should not show a precursor as it's not displayed in the
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
388 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
389 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
390 @ f257fde29c7a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
391 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
392 o 337fec4d2edc
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
393 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
394 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
395
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
396 Precursors template should show the precursor as we force its display with
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
397 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
398 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
399 @ f257fde29c7a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
400 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
401 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
402 o 337fec4d2edc
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
403 | Precursors: 471597cad322
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
404 | semi-colon: 471597cad322
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
405 | x 471597cad322
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
406 |/ Successors: [337fec4d2edc, f257fde29c7a]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
407 | semi-colon: [337fec4d2edc, f257fde29c7a]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
408 | Fate: split as 337fec4d2edc, f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
409 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
410 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
411
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
412 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
413 @ f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
414 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
415 o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
416 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
417 | x 471597cad322
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
418 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
419 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
420 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
421
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
422
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
423 $ hg fatelogjson --hidden
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
424 @ f257fde29c7a []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
425 |
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
426 o 337fec4d2edc []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
427 |
2798
2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
428 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
429 |/
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
430 o ea207398892e []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
431
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
432
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
433 Test templates with folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
434 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
435
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
436 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
437 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
438
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
439 $ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
440 $ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
441 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
442 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
443 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
444 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
445 @ changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
446 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
447 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
448 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
449 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
450 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
451 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
452 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
453 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
454 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
455 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
456 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
457 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
458 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
459 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
460
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
461 $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
462 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
463 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
464 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
465 @ changeset: 3:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
466 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
467 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
468 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
469 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
470 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
471 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
472 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
473 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
474 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
475 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
476 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
477 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
478 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
479 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
480 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
481 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
482 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
483 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
484 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
485 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
487 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
488 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
489
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
490 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
491 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
492 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
493 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
494
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
495 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
496 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
497 o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
498 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
499 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
500 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
501 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
502 | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
503 | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
504 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
505 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
506
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
507 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
508 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
509 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
510 | @ 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
511 |/ Obsfate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
512 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
513 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
514
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
515 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
516 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
517 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
518 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
519
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
520 Precursors template should show both precursors as they should be both
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
521 displayed
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
522 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
523 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
524 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
525 | semi-colon: 0dec01379d3b; 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
526 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
527 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
528 | | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
529 | | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
530 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
531 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
532 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
533 | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
534 | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
535 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
536 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
537
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
538 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
539 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
540 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
541 | @ 0dec01379d3b
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
542 | | Obsfate: rewritten as eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
543 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
544 | x 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
545 |/ Obsfate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
546 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
547 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
548
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
549
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
550 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
552
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
553 Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
554 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
555 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
556 @ eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
557 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
558 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
559
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
560 Precursors template should show both precursors as we force its display with
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
561 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
562 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
563 @ eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
564 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
565 | semi-colon: 0dec01379d3b; 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
566 | x 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
567 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
568 | | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
569 | | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
570 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
571 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
572 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
573 | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
574 | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
575 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
576 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
577
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
578 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
579 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
580 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
581 | x 0dec01379d3b
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
582 | | Obsfate: rewritten as eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
583 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
584 | x 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
585 |/ Obsfate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
586 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
587 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
588
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
589
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
590 $ hg fatelogjson --hidden
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
591 @ eb5a0daa2192 []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
592 |
2798
2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
593 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
594 | |
2798
2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
595 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
596 |/
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
597 o ea207398892e []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
598
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
599
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
600 Test templates with divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
601 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
602
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
603 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
604 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
605
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
606 $ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
607 $ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
608 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
609 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
610 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
611 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
612 @ changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
613 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
614 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
615 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
616 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
617 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
618 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
619 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
620 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
621 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
622 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
623 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
624 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
625 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
626 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
627 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
628
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
629 $ hg update --hidden 'desc(A0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
630 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
631 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
632 (use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
633 $ hg amend -m "A2"
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3105
diff changeset
634 2 new divergent changesets
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
635 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
636 @ changeset: 3:65b757b745b9
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
637 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
638 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
639 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
640 | date: Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3105
diff changeset
641 | trouble: divergent
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
642 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
643 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
644 | o changeset: 2:fdf9bde5129a
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
645 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
646 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
647 | date: Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3105
diff changeset
648 | trouble: divergent
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
649 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
650 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
651 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
652 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
653 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
654 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
655 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
656 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
657 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
658 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
659 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
660
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
661 $ hg amend -m 'A3'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
662
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
663 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
664 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
665
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
666 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
667 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
668 working directory parent is obsolete! (471f378eab4c)
3154
406992d0d611 evolve: rename --contentdivergent flag to --content-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
669 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
670
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
671 Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
672 $ hg tlog
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
673 o 019fadeab383
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
674 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
675 | semi-colon: 471f378eab4c
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
676 | o fdf9bde5129a
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
677 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
678 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
679 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
680 |/ Successors: [fdf9bde5129a], [019fadeab383]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
681 | semi-colon: [fdf9bde5129a]; [019fadeab383]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
682 | Fate: reworded as fdf9bde5129a
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
683 | Fate: reworded as 019fadeab383
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
684 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
685 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
686
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
687 $ hg fatelog
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
688 o 019fadeab383
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
689 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
690 | o fdf9bde5129a
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
691 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
692 | @ 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
693 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
694 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
695 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
696
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
697
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
698 $ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
699 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
700 Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
701 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
702 $ hg tlog
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
703 o 019fadeab383
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
704 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
705 | @ fdf9bde5129a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
706 |/
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
707 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
708
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
709
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
710 $ hg fatelog
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
711 o 019fadeab383
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
712 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
713 | @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
714 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
715 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
716
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
717 Precursors template should a precursor as we force its display with --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
718 $ hg tlog --hidden
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
719 o 019fadeab383
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
720 | Precursors: 65b757b745b9
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
721 | semi-colon: 65b757b745b9
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
722 | x 65b757b745b9
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
723 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
724 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
725 | Successors: [019fadeab383]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
726 | semi-colon: [019fadeab383]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
727 | Fate: reworded as 019fadeab383
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
728 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
729 | @ fdf9bde5129a
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
730 |/ Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
731 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
732 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
733 |/ Successors: [fdf9bde5129a], [65b757b745b9]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
734 | semi-colon: [fdf9bde5129a]; [65b757b745b9]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
735 | Fate: reworded as fdf9bde5129a
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
736 | Fate: reworded as 65b757b745b9
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
737 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
738 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
739
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
740 $ hg fatelog --hidden
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
741 o 019fadeab383
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
742 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
743 | x 65b757b745b9
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
744 |/ Obsfate: reworded as 019fadeab383
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
745 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
746 | @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
747 |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
748 | x 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
749 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
750 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
751 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
752
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
753
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
754 $ hg fatelogjson --hidden
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
755 o 019fadeab383 []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
756 |
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
757 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
758 |/
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
759 | @ fdf9bde5129a []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
760 |/
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
761 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
762 |/
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
763 o ea207398892e []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
764
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
765
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
766 Test templates with amended + folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
767 ===========================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
768
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
769 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
770 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
771
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
772 $ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
773 $ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
774 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
775 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
776 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
777 $ hg amend -m "B1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
778 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
779 @ changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
780 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
781 | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
782 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
783 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
784 | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
785 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
786 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
787 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
788 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
789 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
790 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
791 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
792 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
793 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
794 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
795 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
796 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
797 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
798 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
799 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
800
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
801 $ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
802 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
803 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
804 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
805 @ changeset: 4:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
806 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
807 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
808 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
809 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
810 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
811 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
812 | x changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
813 | | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
814 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
815 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
816 | | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
817 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
818 | | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
819 | |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
820 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
821 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
822 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
823 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
824 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
825 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
826 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
827 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
828 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
829 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
830 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
831 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
832
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
833 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
834 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
835
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
836 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
837 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
838 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
839 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
840 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
841 o eb5a0daa2192
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
842 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
843 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
844 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
845 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
846 | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
847 | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
848 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
849 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
850
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
851 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
852 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
853 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
854 | @ 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
855 |/ Obsfate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
856 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
857 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
858
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
859 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
860 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
861 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
862 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
863 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
864 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
865 | Precursors: 0dec01379d3b 471f378eab4c
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
866 | semi-colon: 0dec01379d3b; 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
867 | @ 0dec01379d3b
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
868 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
869 | | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
870 | | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
871 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
872 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
873 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
874 | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
875 | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
876 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
877 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
878
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
879 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
880 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
881 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
882 | @ 0dec01379d3b
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
883 | | Obsfate: rewritten as eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
884 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
885 | x 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
886 |/ Obsfate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
887 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
888 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
889
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
890
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
891 $ hg up 'desc(B1)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
892 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
893 working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
894 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
895 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
896 o eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
897 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
898 | semi-colon: 471f378eab4c; b7ea6d14e664
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
899 | @ b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
900 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
901 | | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
902 | | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
903 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
904 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
905 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
906 | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
907 | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
908 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
909 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
910
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
911 $ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
912 o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
913 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
914 | @ b7ea6d14e664
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
915 | | Obsfate: rewritten as eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
916 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
917 | x 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
918 |/ Obsfate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
919 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
920 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
921
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
922
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
923 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
924 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
925 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
926 @ eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
927 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
928 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
929
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
930 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
931 @ eb5a0daa2192
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
932 | Precursors: 471f378eab4c b7ea6d14e664
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
933 | semi-colon: 471f378eab4c; b7ea6d14e664
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
934 | x b7ea6d14e664
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
935 | | Precursors: 0dec01379d3b
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
936 | | semi-colon: 0dec01379d3b
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
937 | | Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
938 | | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
939 | | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
940 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
941 | | x 0dec01379d3b
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
942 | |/ Successors: [b7ea6d14e664]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
943 | | semi-colon: [b7ea6d14e664]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
944 | | Fate: reworded as b7ea6d14e664
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
945 | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
946 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
947 |/ Successors: [eb5a0daa2192]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
948 | semi-colon: [eb5a0daa2192]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
949 | Fate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
950 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
951 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
952
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
953 $ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
954 @ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
955 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
956 | x b7ea6d14e664
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
957 | | Obsfate: rewritten as eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
958 | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
959 | | x 0dec01379d3b
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
960 | |/ Obsfate: reworded as b7ea6d14e664
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
961 | |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
962 | x 471f378eab4c
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
963 |/ Obsfate: rewritten as eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
964 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
965 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
966
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
967 $ hg fatelogjson --hidden
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
968 @ eb5a0daa2192 []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
969 |
2798
2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
970 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
971 | |
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
972 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
973 | |/
2798
2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
974 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
975 |/
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
976 o ea207398892e []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
977
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
978
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
979 Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
980 ==============================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
981
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
982 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
983 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
984
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
985 $ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
986 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
987 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
988 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
989 $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
990 updating to branch default
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
991 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
992 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
993 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
994 @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
995 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
996 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
997 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
998 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
999 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1000 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1001 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1002 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1003 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1004
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1005 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1006 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1007 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1008 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1009 @ changeset: 3:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1010 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1011 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1012 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1013 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1014 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1015 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1016 | x changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1017 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1018 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1019 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1020 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1021 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1022 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1023 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1024 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1025 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1026 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1027 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1028 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1029 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1030 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1031
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1032 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1033 $ hg pull
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1034 pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1035 searching for changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1036 adding changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1037 adding manifests
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1038 adding file changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1039 added 1 changesets with 0 changes to 1 files (+1 heads)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1040 2 new obsolescence markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1041 (run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1042 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1043 (use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1044 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1045 o changeset: 2:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1046 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1047 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1048 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1049 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1050 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1051 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1052 | @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1053 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1054 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1055 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1056 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1057 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1058 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1059 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1060 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1061
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1062 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1063 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1064
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1065 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1066 o 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1067 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
1068 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1069 | @ 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
1070 |/ Successors: [7a230b46bf61]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
1071 | semi-colon: [7a230b46bf61]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
1072 | Fate: reworded as 7a230b46bf61
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
1073 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1074 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
1075
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1076 $ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1077 o 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1078 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1079 | @ 471f378eab4c
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
1080 |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
1081 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1082 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1083
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1084 $ hg up 'desc(A2)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1085 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1086 $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1087 @ 7a230b46bf61
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
1088 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1089 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
1090
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1091 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1092 @ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1093 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1094 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1095
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1096 $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1097 @ 7a230b46bf61
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1098 | Precursors: 471f378eab4c
2500
2092007af205 template: update precursors template output
Boris Feld <boris.feld@octobus.net>
parents: 2499
diff changeset
1099 | semi-colon: 471f378eab4c
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1100 | x 471f378eab4c
2496
5ed8af9c4a21 template: skip "Precursors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2495
diff changeset
1101 |/ Successors: [7a230b46bf61]
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
1102 | semi-colon: [7a230b46bf61]
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
1103 | Fate: reworded as 7a230b46bf61
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
1104 |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
1105 o ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
1106
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1107 $ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1108 @ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1109 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1110 | x 471f378eab4c
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
1111 |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
1112 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1113 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1114
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1115
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1116 $ hg fatelogjson --hidden
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
1117 @ 7a230b46bf61 []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1118 |
3001
67b59d1657cf compat-test: merge future 6.7.0 into 4.2 compat branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2798 3000
diff changeset
1119 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1120 |/
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
1121 o ea207398892e []
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1122
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1123
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1124 Test template with obsmarkers cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1125 ===================================
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1126
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1127 Test setup
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1128 ----------
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1129
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1130 $ hg init $TESTTMP/templates-local-cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1131 $ cd $TESTTMP/templates-local-cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1132 $ mkcommit ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1133 $ mkcommit A0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1134 $ mkcommit B0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1135 $ hg up -r 0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1136 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1137 $ mkcommit C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1138 created new head
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1139
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1140 Create the cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1141
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1142 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1143 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1144 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1145
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1146 Check templates
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1147 ---------------
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1148
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1149 $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1150 @ f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1151 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1152 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1153
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1154 $ hg fatelog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1155 @ f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1156 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1157 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1158
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1159 $ hg up -r "desc(B0)" --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1160 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1161 working directory parent is obsolete! (0dec01379d3b)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1162 (use 'hg evolve' to update to its parent successor)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1163 $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1164 o f897c6137566
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1165 | Precursors: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1166 | semi-colon: 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1167 | @ 0dec01379d3b
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1168 | | Precursors: 471f378eab4c
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1169 | | semi-colon: 471f378eab4c
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1170 | | Successors: [f897c6137566], [471f378eab4c]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1171 | | semi-colon: [f897c6137566]; [471f378eab4c]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1172 | | Fate: rewritten as f897c6137566
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1173 | | Fate: rewritten as 471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1174 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1175 | x 471f378eab4c
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1176 |/ Precursors: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1177 | semi-colon: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1178 | Successors: [0dec01379d3b]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1179 | semi-colon: [0dec01379d3b]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1180 | Fate: rewritten as 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1181 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1182 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1183
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1184 $ hg fatelog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1185 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1186 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1187 | @ 0dec01379d3b
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1188 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1189 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1190 | x 471f378eab4c
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1191 |/ Obsfate: rewritten as 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1192 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1193 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1194
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1195 $ hg up -r "desc(A0)" --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1197 working directory parent is obsolete! (471f378eab4c)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1198 (use 'hg evolve' to update to its parent successor)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1199 $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1200 o f897c6137566
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1201 | Precursors: 471f378eab4c
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1202 | semi-colon: 471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1203 | @ 471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1204 |/ Fate: pruned
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1205 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1206 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1207
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1208 $ hg fatelog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1209 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1210 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1211 | @ 471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1212 |/ Obsfate: pruned
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1213 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1214 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1215
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1216
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1217 $ hg up -r "desc(ROOT)" --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1218 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1219 $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1220 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1221 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1222 @ ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1223
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1224 $ hg fatelog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1225 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1226 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1227 @ ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1228
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1229 $ hg tlog --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1230 o f897c6137566
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1231 | Precursors: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1232 | semi-colon: 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1233 | x 0dec01379d3b
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1234 | | Precursors: 471f378eab4c
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1235 | | semi-colon: 471f378eab4c
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1236 | | Successors: [f897c6137566], [471f378eab4c]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1237 | | semi-colon: [f897c6137566]; [471f378eab4c]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1238 | | Fate: rewritten as f897c6137566
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1239 | | Fate: rewritten as 471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1240 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1241 | x 471f378eab4c
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1242 |/ Precursors: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1243 | semi-colon: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1244 | Successors: [0dec01379d3b]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1245 | semi-colon: [0dec01379d3b]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1246 | Fate: rewritten as 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1247 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1248 @ ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1249
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1250 Test template with split + divergence with cycles
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1251 =================================================
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1252
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1253 $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1254 o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1255 | tag: tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1256 | parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1257 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1258 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1259 | summary: C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1260 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1261 @ changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1262 user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1263 date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1264 summary: ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1265
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1266 $ hg up
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1267 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1268
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1269 Create a commit with three files
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1270 $ touch A B C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1271 $ hg commit -A -m "Add A,B,C" A B C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1272
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1273 Split it
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1274 $ hg up 3
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1275 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1276 $ touch A
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1277 $ hg commit -A -m "Add A,B,C" A
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1278 created new head
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1279
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1280 $ touch B
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1281 $ hg commit -A -m "Add A,B,C" B
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1282
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1283 $ touch C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1284 $ hg commit -A -m "Add A,B,C" C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1285
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1286 $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1287 @ changeset: 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1288 | tag: tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1289 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1290 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1291 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1292 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1293 o changeset: 6:4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1294 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1295 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1296 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1297 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1298 o changeset: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1299 | parent: 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1300 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1301 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1302 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1303 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1304 | o changeset: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1305 |/ user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1306 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1307 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1308 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1309 o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1310 | parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1311 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1312 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1313 | summary: C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1314 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1315 o changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1316 user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1317 date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1318 summary: ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1319
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1320 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1321 $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1322 @ changeset: 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1323 | tag: tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1324 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1325 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1326 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1327 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1328 o changeset: 6:4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1329 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1330 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1331 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1332 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1333 o changeset: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1334 | parent: 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1335 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1336 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1337 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1338 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1339 o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1340 | parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1341 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1342 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1343 | summary: C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1344 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1345 o changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1346 user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1347 date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1348 summary: ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1349
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1350 Diverge one of the splitted commit
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1351
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1352 $ hg up 6
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1353 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1354 $ hg commit --amend -m "Add only B"
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1355 1 new unstable changesets
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1356
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1357 $ hg up 6 --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1358 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1359 working directory parent is obsolete! (4a004186e638)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1360 (use 'hg evolve' to update to its successor: b18bc8331526)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1361 $ hg commit --amend -m "Add B only"
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1362 4 new divergent changesets
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1363
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1364 $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1365 @ changeset: 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1366 | tag: tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1367 | parent: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1368 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1369 | date: Thu Jan 01 00:00:00 1970 +0000
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1370 | trouble: divergent
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1371 | summary: Add B only
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1372 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1373 | o changeset: 8:b18bc8331526
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1374 |/ parent: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1375 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1376 | date: Thu Jan 01 00:00:00 1970 +0000
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1377 | trouble: divergent
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1378 | summary: Add only B
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1379 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1380 | o changeset: 7:ba2ed02b0c9a
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1381 | | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1382 | | date: Thu Jan 01 00:00:00 1970 +0000
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1383 | | trouble: unstable, divergent
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1384 | | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1385 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1386 | x changeset: 6:4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1387 |/ user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1388 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1389 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1390 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1391 o changeset: 5:dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1392 | parent: 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1393 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1394 | date: Thu Jan 01 00:00:00 1970 +0000
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1395 | trouble: divergent
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1396 | summary: Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1397 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1398 o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1399 | parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1400 | user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1401 | date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1402 | summary: C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1403 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1404 o changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1405 user: test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1406 date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1407 summary: ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1408
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1409 Check templates
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1410 ---------------
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1411
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1412 $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1413 @ 0b997eb7ceee
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1414 | Precursors: 4a004186e638
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1415 | semi-colon: 4a004186e638
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1416 | o b18bc8331526
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1417 |/ Precursors: 4a004186e638
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1418 | semi-colon: 4a004186e638
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1419 | o ba2ed02b0c9a
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1420 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1421 | x 4a004186e638
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1422 |/ Successors: [b18bc8331526], [0b997eb7ceee]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1423 | semi-colon: [b18bc8331526]; [0b997eb7ceee]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1424 | Fate: reworded as b18bc8331526
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1425 | Fate: reworded as 0b997eb7ceee
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1426 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1427 o dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1428 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1429 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1430 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1431 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1432
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1433 $ hg fatelog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1434 @ 0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1435 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1436 | o b18bc8331526
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1437 |/
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1438 | o ba2ed02b0c9a
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1439 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1440 | x 4a004186e638
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1441 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1442 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1443 o dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1444 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1445 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1446 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1447 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1448
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1449 $ hg tlog --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1450 @ 0b997eb7ceee
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1451 | Precursors: 4a004186e638
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1452 | semi-colon: 4a004186e638
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1453 | o b18bc8331526
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1454 |/ Precursors: 4a004186e638
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1455 | semi-colon: 4a004186e638
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1456 | o ba2ed02b0c9a
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1457 | | Precursors: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1458 | | semi-colon: 9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1459 | x 4a004186e638
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1460 |/ Precursors: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1461 | semi-colon: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1462 | Successors: [b18bc8331526], [0b997eb7ceee]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1463 | semi-colon: [b18bc8331526]; [0b997eb7ceee]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1464 | Fate: reworded as b18bc8331526
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1465 | Fate: reworded as 0b997eb7ceee
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1466 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1467 o dd800401bd8c
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1468 | Precursors: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1469 | semi-colon: 9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1470 | x 9bd10a0775e4
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1471 |/ Successors: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1472 | semi-colon: [dd800401bd8c, 4a004186e638, ba2ed02b0c9a]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1473 | Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1474 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1475 o f897c6137566
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1476 | Precursors: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1477 | semi-colon: 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1478 | x 0dec01379d3b
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1479 | | Precursors: 471f378eab4c
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1480 | | semi-colon: 471f378eab4c
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1481 | | Successors: [f897c6137566], [471f378eab4c]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1482 | | semi-colon: [f897c6137566]; [471f378eab4c]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1483 | | Fate: rewritten as f897c6137566
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1484 | | Fate: rewritten as 471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1485 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1486 | x 471f378eab4c
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1487 |/ Precursors: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1488 | semi-colon: 0dec01379d3b
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1489 | Successors: [0dec01379d3b]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1490 | semi-colon: [0dec01379d3b]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1491 | Fate: rewritten as 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1492 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1493 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1494
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1495 $ hg fatelog --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1496 @ 0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1497 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1498 | o b18bc8331526
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1499 |/
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1500 | o ba2ed02b0c9a
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1501 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1502 | x 4a004186e638
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1503 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1504 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1505 o dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1506 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1507 | x 9bd10a0775e4
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1508 |/ Obsfate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1509 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1510 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1511 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1512 | x 0dec01379d3b
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1513 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1514 | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1515 | x 471f378eab4c
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1516 |/ Obsfate: rewritten as 0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1517 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1518 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1519
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1520 $ hg up --hidden 4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1521 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1522 working directory parent is obsolete! (9bd10a0775e4)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1523 (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1524 $ hg rebase -r 7 -d 8 --config extensions.rebase=
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1525 rebasing 7:ba2ed02b0c9a "Add A,B,C"
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1526 $ hg tlog
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1527 o eceed8f98ffc
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1528 | Precursors: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1529 | semi-colon: 9bd10a0775e4
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1530 | o 0b997eb7ceee
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1531 | | Precursors: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1532 | | semi-colon: 9bd10a0775e4
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1533 o | b18bc8331526
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1534 |/ Precursors: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1535 | semi-colon: 9bd10a0775e4
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1536 o dd800401bd8c
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1537 | Precursors: 9bd10a0775e4
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1538 | semi-colon: 9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1539 | @ 9bd10a0775e4
3419
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1540 |/ Successors: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc], [dd800401bd8c, b18bc8331526, eceed8f98ffc]
1e2f683e11e7 test-compat: merge mercurial-4.3 into mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3167 3418
diff changeset
1541 | semi-colon: [dd800401bd8c, 0b997eb7ceee, eceed8f98ffc]; [dd800401bd8c, b18bc8331526, eceed8f98ffc]
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1542 | Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1543 | Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1544 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1545 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1546 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1547 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1548
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1549 $ hg fatelog
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1550 o eceed8f98ffc
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1551 |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1552 | o 0b997eb7ceee
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1553 | |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1554 o | b18bc8331526
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1555 |/
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3410
diff changeset
1556 o dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1557 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1558 | @ 9bd10a0775e4
3418
85cdce113c2c test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3166 3412
diff changeset
1559 |/ Obsfate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc; split as b18bc8331526, dd800401bd8c, eceed8f98ffc
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1560 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1561 o f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1562 |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1563 o ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
1564
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1565 Test templates with pruned commits
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1566 ==================================
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1567
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1568 Test setup
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1569 ----------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1570
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1571 $ hg init $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1572 $ cd $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1573 $ mkcommit ROOT
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1574 $ mkcommit A0
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1575 $ hg prune .
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1576 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1577 working directory now at ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1578 1 changesets pruned
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1579
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1580 Check output
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1581 ------------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1582
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1583 $ hg up "desc(A0)" --hidden
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1584 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1585 working directory parent is obsolete! (471f378eab4c)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1586 (use 'hg evolve' to update to its parent successor)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1587 $ hg tlog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1588 @ 471f378eab4c
2612
fd35b428edfc obsfate: by default only display the username if differ from the current one
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2611
diff changeset
1589 | Fate: pruned
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
1590 |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1591 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1592
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1593 $ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1594 @ 471f378eab4c
2798
2280461343e5 test-compat: merge mercurial-4.2 with the new stable branch content
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2710
diff changeset
1595 | Obsfate: pruned by test (at *) (glob)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1596 |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1597 o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
1598