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