annotate tests/test-evolve-templates.t @ 2489:84a8219a2f9a

template: add the obsfate template Reuse _getobsoletefate and nextvisiblesuccessors to easily get the obsolescence fate of any node. The limitation is that obsfate is as precise as these two functions, which is not great for nextvisiblesuccessors.
author Boris Feld <boris.feld@octobus.net>
date Fri, 26 May 2017 13:28:49 +0200
parents 590da9c523ae
children 94f171534918
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1 This test file test the various templates for precursors and successors.
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
3 Global setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
4 ============
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
5
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
6 $ . $TESTDIR/testlib/common.sh
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
7 $ cat >> $HGRCPATH <<EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
8 > [ui]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
9 > interactive = true
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
10 > [phases]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
11 > publish=False
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
12 > [extensions]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
13 > evolve =
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
14 > [alias]
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
15 > tlog = log -G -T '{node|short} Precursors: {precursors} | Successors: {successors} | Fate: {obsfate}\n'
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
16 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
17
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
18 Test templates on amended commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
19 ================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
20
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
21 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
22 ----------
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 $ hg init $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
25 $ cd $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
26 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
27 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
28 $ echo 42 >> A0
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
29 $ hg amend -m "A1"
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
30 $ hg amend -m "A2"
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
31 $ hg log --hidden -G
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
32 @ changeset: 4:d004c8f274b9
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
33 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
34 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
35 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
36 | 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
37 | summary: A2
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
38 |
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
39 | x changeset: 3:a468dc9b3633
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
40 |/ parent: 0:ea207398892e
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
41 | user: test
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
42 | date: Thu Jan 01 00:00:00 1970 +0000
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
43 | summary: A1
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
44 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
45 | x changeset: 2:f137d23bb3e1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
46 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
47 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
48 | | summary: temporary amend commit for 471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
49 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
50 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
51 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
52 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
53 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
54 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
55 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
56 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
57 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
58 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
59
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
60 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
61 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
62 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
64 working directory parent is obsolete! (471f378eab4c)
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
65 (use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
66
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
67 Precursors template should show current revision as it is the working copy
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
68 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
69 o d004c8f274b9 Precursors: 471f378eab4c | Successors: | Fate:
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
70 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
71 | @ 471f378eab4c Precursors: | Successors: [d004c8f274b9] | Fate: superseed
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
72 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
73 o ea207398892e Precursors: | Successors: | Fate:
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
74
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
75 $ hg up 'desc(A1)' --hidden
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
77 working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
78 (use 'hg evolve' to update to its successor: d004c8f274b9)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
79
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
80 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
81 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
82 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
83 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
84 | @ a468dc9b3633 Precursors: | Successors: [d004c8f274b9] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
85 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
86 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
87
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
88 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
89 --hidden
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
90 $ hg tlog --hidden
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
91 o d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
92 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
93 | @ a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
94 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
95 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
96 | |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
97 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
98 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
99 o ea207398892e Precursors: | Successors: | Fate:
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
100
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
101
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
102 $ hg up 'desc(A2)'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
103 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
104 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
105 @ d004c8f274b9 Precursors: | Successors: | Fate:
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
106 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
107 o ea207398892e Precursors: | Successors: | Fate:
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
108
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
109 $ hg tlog --hidden
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
110 @ d004c8f274b9 Precursors: a468dc9b3633 | Successors: | Fate:
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
111 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
112 | x a468dc9b3633 Precursors: 471f378eab4c | Successors: [d004c8f274b9] | Fate: superseed
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
113 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
114 | x f137d23bb3e1 Precursors: | Successors: | Fate: pruned
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
115 | |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
116 | x 471f378eab4c Precursors: | Successors: [a468dc9b3633] | Fate: superseed
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
117 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
118 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
119
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
120
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
121 Test templates with splitted commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
122 ===================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
123
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
124 $ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
125 $ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
126 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
127 $ echo 42 >> a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
128 $ echo 43 >> b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
129 $ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
130 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
131 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
132 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
133 @ changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
134 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
135 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
136 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
137 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
138 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
139 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
140 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
141 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
142 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
143
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
144 $ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
145 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
146 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
147 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
148 > n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
149 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
150 > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
151 > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
152 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
153 adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
154 adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
155 diff --git a/a b/a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
156 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
157 examine changes to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
158
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
159 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
160 +42
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
161 record change 1/2 to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
162
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
163 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
164 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
165 examine changes to 'b'? [Ynesfdaq?] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
166
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
167 created new head
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
168 Done splitting? [yN] n
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
169 diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
170 new file mode 100644
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
171 examine changes to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
172
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
173 @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
174 +43
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
175 record this change to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
176
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
177 no more change to split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
178
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
179 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
180 @ changeset: 3:f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
181 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
182 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
183 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
184 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
185 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
186 o changeset: 2:337fec4d2edc
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
187 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
188 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
189 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
190 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
191 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
192 | x changeset: 1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
193 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
194 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
195 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
196 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
197 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
198 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
199 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
200 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
201
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
202
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
203 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
204 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
205
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
206 $ hg up 'obsolete()' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
207 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
208 working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
209 (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
210
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
211 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
212 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
213 o f257fde29c7a Precursors: 471597cad322 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
214 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
215 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
216 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
217 | @ 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed_split
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
218 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
219 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
220
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
221 $ hg up f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
222 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
223
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
224 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
225 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
226 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
227 @ f257fde29c7a Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
228 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
229 o 337fec4d2edc Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
230 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
231 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
232
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
233 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
234 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
235 $ hg tlog --hidden
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
236 @ f257fde29c7a Precursors: 471597cad322 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
237 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
238 o 337fec4d2edc Precursors: 471597cad322 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
239 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
240 | x 471597cad322 Precursors: | Successors: [337fec4d2edc, f257fde29c7a] | Fate: superseed_split
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
241 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
242 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
243
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
244 Test templates with folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
245 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
246
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
247 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
248 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
249
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
250 $ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
251 $ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
252 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
253 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
254 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
255 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
256 @ changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
257 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
258 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
259 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
260 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
261 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
262 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
263 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
264 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
265 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
266 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
267 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
268 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
269 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
270 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
271
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
272 $ 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
273 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
274 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
275 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
276 @ changeset: 3:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
277 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
278 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
279 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
280 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
281 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
282 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
283 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
284 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
285 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
286 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
287 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
288 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
289 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
290 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
291 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
292 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
293 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
294 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
295 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
296 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
297
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
298 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
299 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
300
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
301 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
302 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
303 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
304 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
305
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
306 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
307 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
308 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
309 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
310 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
311 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
312 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
313
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
314 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
316 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
317 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
318
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
319 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
320 displayed
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
321 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
322 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
323 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
324 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
325 | |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
326 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
327 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
328 o ea207398892e Precursors: | Successors: | Fate:
2486
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 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
331 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
332
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
333 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
334 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
335 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
336 @ eb5a0daa2192 Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
337 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
338 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
339
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
340 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
341 --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
342 $ hg tlog --hidden
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
343 @ eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
344 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
345 | x 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
346 | |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
347 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
348 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
349 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
350
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
351
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
352 Test templates with divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
353 ==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
354
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
355 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
356 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
357
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
358 $ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
359 $ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
360 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
361 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
362 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
363 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
364 @ changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
365 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
366 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
367 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
368 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
369 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
370 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
371 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
372 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
373 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
374 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
375 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
376 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
377 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
378 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
379 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
380
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
381 $ hg update --hidden 'desc(A0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
382 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
383 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
384 (use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
385 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
386 2 new divergent changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
387 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
388 @ changeset: 3:65b757b745b9
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
389 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
390 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
391 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
392 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
393 | trouble: divergent
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
394 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
395 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
396 | o changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
397 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
398 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
399 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
400 | trouble: divergent
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
401 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
402 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
403 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
404 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
405 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
406 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
407 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
408 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
409 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
410 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
411 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
412
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
413 $ hg amend -m 'A3'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
414
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
415 Check templates
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
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
418 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
419 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
420 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
421 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
422
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
423 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
424 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
425 o 019fadeab383 Precursors: 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
426 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
427 | o fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
428 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
429 | @ 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [019fadeab383] | Fate: diverged
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
430 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
431 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
432
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
433 $ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
434 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
435 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
436 log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
437 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
438 o 019fadeab383 Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
439 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
440 | @ fdf9bde5129a Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
441 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
442 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
443
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
444 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
445 $ hg tlog --hidden
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
446 o 019fadeab383 Precursors: 65b757b745b9 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
447 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
448 | x 65b757b745b9 Precursors: 471f378eab4c | Successors: [019fadeab383] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
449 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
450 | @ fdf9bde5129a Precursors: 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
451 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
452 | x 471f378eab4c Precursors: | Successors: [fdf9bde5129a], [65b757b745b9] | Fate: diverged
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
453 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
454 o ea207398892e Precursors: | Successors: | Fate:
2486
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 Test templates with amended + folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
457 ===========================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
458
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
459 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
460 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
461
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
462 $ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
463 $ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
464 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
465 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
466 $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
467 $ hg amend -m "B1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
468 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
469 @ changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
470 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
471 | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
472 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
473 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
474 | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
475 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
476 | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
477 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
478 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
479 | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
480 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
481 o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
482 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
483 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
484 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
485 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
486 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
487 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
488 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
489 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
490
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
491 $ 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
492 2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
493 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
494 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
495 @ changeset: 4:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
496 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
497 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
498 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
499 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
500 | summary: C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
501 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
502 | x changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
503 | | parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
504 | | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
505 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
506 | | summary: B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
507 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
508 | | x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
509 | |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
510 | | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
511 | | summary: B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
512 | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
513 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
514 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
515 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
516 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
517 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
518 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
519 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
520 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
521 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
522
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
523 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
524 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
525
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
526 $ hg up 'desc(A0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
527 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
528 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
529 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
530 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
531 o eb5a0daa2192 Precursors: 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
532 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
533 | @ 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
534 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
535 o ea207398892e Precursors: | Successors: | Fate:
2486
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 $ hg up 'desc(B0)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
538 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
539 working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
540 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
541 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
542 o eb5a0daa2192 Precursors: 0dec01379d3b, 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
543 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
544 | @ 0dec01379d3b Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
545 | |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
546 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
547 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
548 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
549
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
550 $ hg up 'desc(B1)' --hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
552 working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
553 (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
554 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
555 o eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
556 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
557 | @ b7ea6d14e664 Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
558 | |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
559 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
560 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
561 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
562
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
563 $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
564 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
565 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
566 @ eb5a0daa2192 Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
567 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
568 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
569
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
570 $ hg tlog --hidden
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
571 @ eb5a0daa2192 Precursors: 471f378eab4c, b7ea6d14e664 | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
572 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
573 | x b7ea6d14e664 Precursors: 0dec01379d3b | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
574 | |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
575 | | x 0dec01379d3b Precursors: | Successors: [b7ea6d14e664] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
576 | |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
577 | x 471f378eab4c Precursors: | Successors: [eb5a0daa2192] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
578 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
579 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
580
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
581
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
582 Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
583 ==============================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
584
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
585 Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
586 ----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
587
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
588 $ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
589 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
590 $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
591 $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
592 $ 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
593 updating to branch default
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
594 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
595 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
596 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
597 @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
598 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
599 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
600 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
601 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
602 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
603 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
604 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
605 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
606 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
607
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
608 $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
609 $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
610 $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
611 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
612 @ changeset: 3:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
613 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
614 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
615 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
616 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
617 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
618 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
619 | x changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
620 |/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
621 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
622 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
623 | summary: A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
624 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
625 | x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
626 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
627 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
628 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
629 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
630 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
631 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
632 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
633 summary: ROOT
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 $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
636 $ hg pull
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
637 pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
638 searching for changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
639 adding changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
640 adding manifests
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
641 adding file changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
642 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
643 2 new obsolescence markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
644 (run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
645 working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
646 (use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
647 $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
648 o changeset: 2:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
649 | tag: tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
650 | parent: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
651 | user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
652 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
653 | summary: A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
654 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
655 | @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
656 |/ user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
657 | date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
658 | summary: A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
659 |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
660 o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
661 user: test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
662 date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
663 summary: ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
665
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
666 Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
667 ---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
668
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
669 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
670 o 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
671 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
672 | @ 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
673 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
674 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
675
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
676 $ hg up 'desc(A2)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
677 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
678 $ hg tlog
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
679 @ 7a230b46bf61 Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
680 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
681 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
682
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
683 $ hg tlog --hidden
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
684 @ 7a230b46bf61 Precursors: 471f378eab4c | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
685 |
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
686 | x 471f378eab4c Precursors: | Successors: [7a230b46bf61] | Fate: superseed
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
687 |/
2489
84a8219a2f9a template: add the obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2487
diff changeset
688 o ea207398892e Precursors: | Successors: | Fate:
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
689