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