| changeset 3083 | e91ca8b5ecf7 |
| parent 3057 | cb8ae3cb0bbc |
| child 3098 | 87b83a3e0392 |
| child 3115 | 663dbef40f97 |
| 3082:326e0ee1eed1 | 3083:e91ca8b5ecf7 |
|---|---|
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
17 > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
18 > {if(successors, "\n Successors: {successors}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
19 > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ |
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' |
20 > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' |
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' |
21 > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' |
22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n' |
22 > fatelogjson = log -G -T '{node|short} {obsfatedata|json}\n' |
23 > EOF |
23 > EOF |
24 |
24 |
25 Test templates on amended commit |
25 Test templates on amended commit |
26 ================================ |
26 ================================ |
27 |
27 |
45 | |
45 | |
46 | x changeset: 2:a468dc9b3633 |
46 | x changeset: 2:a468dc9b3633 |
47 |/ parent: 0:ea207398892e |
47 |/ parent: 0:ea207398892e |
48 | user: test |
48 | user: test |
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
49 | date: Thu Jan 01 00:00:00 1970 +0000 |
50 | obsolete: reworded as d004c8f274b9 by test2 |
50 | obsolete: reworded as 3:d004c8f274b9 by test2 |
51 | summary: A1 |
51 | summary: A1 |
52 | |
52 | |
53 | x changeset: 1:471f378eab4c |
53 | x changeset: 1:471f378eab4c |
54 |/ user: test |
54 |/ user: test |
55 | date: Thu Jan 01 00:00:00 1970 +0000 |
55 | date: Thu Jan 01 00:00:00 1970 +0000 |
56 | obsolete: rewritten as a468dc9b3633 |
56 | obsolete: rewritten as 2:a468dc9b3633 |
57 | summary: A0 |
57 | summary: A0 |
58 | |
58 | |
59 o changeset: 0:ea207398892e |
59 o changeset: 0:ea207398892e |
60 user: test |
60 user: test |
61 date: Thu Jan 01 00:00:00 1970 +0000 |
61 date: Thu Jan 01 00:00:00 1970 +0000 |
78 @ 471f378eab4c (1) A0 |
78 @ 471f378eab4c (1) A0 |
79 rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000) |
79 rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000) |
80 |
80 |
81 $ hg tlog |
81 $ hg tlog |
82 o d004c8f274b9 |
82 o d004c8f274b9 |
83 | Precursors: 471f378eab4c |
83 | Precursors: 1:471f378eab4c |
84 | semi-colon: 471f378eab4c |
84 | semi-colon: 1:471f378eab4c |
85 | @ 471f378eab4c |
85 | @ 471f378eab4c |
86 |/ Successors: [d004c8f274b9] |
86 |/ Successors: 3:d004c8f274b9 |
87 | semi-colon: [d004c8f274b9] |
87 | semi-colon: 3:d004c8f274b9 |
88 | Fate: rewritten as d004c8f274b9 by test, test2 |
88 | Fate: rewritten as 3:d004c8f274b9 by test, test2 |
89 | |
89 | |
90 o ea207398892e |
90 o ea207398892e |
91 |
91 |
92 |
92 |
93 $ hg log -G |
93 $ hg log -G |
99 | summary: A2 |
99 | summary: A2 |
100 | |
100 | |
101 | @ changeset: 1:471f378eab4c |
101 | @ changeset: 1:471f378eab4c |
102 |/ user: test |
102 |/ user: test |
103 | date: Thu Jan 01 00:00:00 1970 +0000 |
103 | date: Thu Jan 01 00:00:00 1970 +0000 |
104 | obsolete: rewritten as d004c8f274b9 by test, test2 |
104 | obsolete: rewritten as 3:d004c8f274b9 by test, test2 |
105 | summary: A0 |
105 | summary: A0 |
106 | |
106 | |
107 o changeset: 0:ea207398892e |
107 o changeset: 0:ea207398892e |
108 user: test |
108 user: test |
109 date: Thu Jan 01 00:00:00 1970 +0000 |
109 date: Thu Jan 01 00:00:00 1970 +0000 |
112 |
112 |
113 $ hg fatelog -q |
113 $ hg fatelog -q |
114 o d004c8f274b9 |
114 o d004c8f274b9 |
115 | |
115 | |
116 | @ 471f378eab4c |
116 | @ 471f378eab4c |
117 |/ Obsfate: rewritten as d004c8f274b9 |
117 |/ Obsfate: rewritten as 3:d004c8f274b9 |
118 | |
118 | |
119 o ea207398892e |
119 o ea207398892e |
120 |
120 |
121 |
121 |
122 $ hg fatelog |
122 $ hg fatelog |
123 o d004c8f274b9 |
123 o d004c8f274b9 |
124 | |
124 | |
125 | @ 471f378eab4c |
125 | @ 471f378eab4c |
126 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 |
126 |/ Obsfate: rewritten as 3:d004c8f274b9 by test, test2 |
127 | |
127 | |
128 o ea207398892e |
128 o ea207398892e |
129 |
129 |
130 $ hg fatelog -v |
130 $ hg fatelog -v |
131 o d004c8f274b9 |
131 o d004c8f274b9 |
132 | |
132 | |
133 | @ 471f378eab4c |
133 | @ 471f378eab4c |
134 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) |
134 |/ Obsfate: rewritten as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) |
135 | |
135 | |
136 o ea207398892e |
136 o ea207398892e |
137 |
137 |
138 |
138 |
139 (check json) |
139 (check json) |
160 (use 'hg evolve' to update to its successor: d004c8f274b9) |
160 (use 'hg evolve' to update to its successor: d004c8f274b9) |
161 |
161 |
162 Precursors template should show current revision as it is the working copy |
162 Precursors template should show current revision as it is the working copy |
163 $ hg tlog |
163 $ hg tlog |
164 o d004c8f274b9 |
164 o d004c8f274b9 |
165 | Precursors: a468dc9b3633 |
165 | Precursors: 2:a468dc9b3633 |
166 | semi-colon: a468dc9b3633 |
166 | semi-colon: 2:a468dc9b3633 |
167 | @ a468dc9b3633 |
167 | @ a468dc9b3633 |
168 |/ Successors: [d004c8f274b9] |
168 |/ Successors: 3:d004c8f274b9 |
169 | semi-colon: [d004c8f274b9] |
169 | semi-colon: 3:d004c8f274b9 |
170 | Fate: reworded as d004c8f274b9 by test2 |
170 | Fate: reworded as 3:d004c8f274b9 by test2 |
171 | |
171 | |
172 o ea207398892e |
172 o ea207398892e |
173 |
173 |
174 Precursors template should show the precursor as we force its display with |
174 Precursors template should show the precursor as we force its display with |
175 --hidden |
175 --hidden |
176 $ hg tlog --hidden |
176 $ hg tlog --hidden |
177 o d004c8f274b9 |
177 o d004c8f274b9 |
178 | Precursors: a468dc9b3633 |
178 | Precursors: 2:a468dc9b3633 |
179 | semi-colon: a468dc9b3633 |
179 | semi-colon: 2:a468dc9b3633 |
180 | @ a468dc9b3633 |
180 | @ a468dc9b3633 |
181 |/ Precursors: 471f378eab4c |
181 |/ Precursors: 1:471f378eab4c |
182 | semi-colon: 471f378eab4c |
182 | semi-colon: 1:471f378eab4c |
183 | Successors: [d004c8f274b9] |
183 | Successors: 3:d004c8f274b9 |
184 | semi-colon: [d004c8f274b9] |
184 | semi-colon: 3:d004c8f274b9 |
185 | Fate: reworded as d004c8f274b9 by test2 |
185 | Fate: reworded as 3:d004c8f274b9 by test2 |
186 | |
186 | |
187 | x 471f378eab4c |
187 | x 471f378eab4c |
188 |/ Successors: [a468dc9b3633] |
188 |/ Successors: 2:a468dc9b3633 |
189 | semi-colon: [a468dc9b3633] |
189 | semi-colon: 2:a468dc9b3633 |
190 | Fate: rewritten as a468dc9b3633 |
190 | Fate: rewritten as 2:a468dc9b3633 |
191 | |
191 | |
192 o ea207398892e |
192 o ea207398892e |
193 |
193 |
194 $ hg fatelog -v |
194 $ hg fatelog -v |
195 o d004c8f274b9 |
195 o d004c8f274b9 |
196 | |
196 | |
197 | @ a468dc9b3633 |
197 | @ a468dc9b3633 |
198 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
198 |/ Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
199 | |
199 | |
200 o ea207398892e |
200 o ea207398892e |
201 |
201 |
202 $ hg up 'desc(A2)' |
202 $ hg up 'desc(A2)' |
203 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
203 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
206 | |
206 | |
207 o ea207398892e |
207 o ea207398892e |
208 |
208 |
209 $ hg tlog --hidden |
209 $ hg tlog --hidden |
210 @ d004c8f274b9 |
210 @ d004c8f274b9 |
211 | Precursors: a468dc9b3633 |
211 | Precursors: 2:a468dc9b3633 |
212 | semi-colon: a468dc9b3633 |
212 | semi-colon: 2:a468dc9b3633 |
213 | x a468dc9b3633 |
213 | x a468dc9b3633 |
214 |/ Precursors: 471f378eab4c |
214 |/ Precursors: 1:471f378eab4c |
215 | semi-colon: 471f378eab4c |
215 | semi-colon: 1:471f378eab4c |
216 | Successors: [d004c8f274b9] |
216 | Successors: 3:d004c8f274b9 |
217 | semi-colon: [d004c8f274b9] |
217 | semi-colon: 3:d004c8f274b9 |
218 | Fate: reworded as d004c8f274b9 by test2 |
218 | Fate: reworded as 3:d004c8f274b9 by test2 |
219 | |
219 | |
220 | x 471f378eab4c |
220 | x 471f378eab4c |
221 |/ Successors: [a468dc9b3633] |
221 |/ Successors: 2:a468dc9b3633 |
222 | semi-colon: [a468dc9b3633] |
222 | semi-colon: 2:a468dc9b3633 |
223 | Fate: rewritten as a468dc9b3633 |
223 | Fate: rewritten as 2:a468dc9b3633 |
224 | |
224 | |
225 o ea207398892e |
225 o ea207398892e |
226 |
226 |
227 $ hg fatelog -v |
227 $ hg fatelog -v |
228 @ d004c8f274b9 |
228 @ d004c8f274b9 |
232 |
232 |
233 $ hg fatelog -v --hidden |
233 $ hg fatelog -v --hidden |
234 @ d004c8f274b9 |
234 @ d004c8f274b9 |
235 | |
235 | |
236 | x a468dc9b3633 |
236 | x a468dc9b3633 |
237 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
237 |/ Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
238 | |
238 | |
239 | x 471f378eab4c |
239 | x 471f378eab4c |
240 |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
240 |/ Obsfate: rewritten as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
241 | |
241 | |
242 o ea207398892e |
242 o ea207398892e |
243 |
243 |
244 |
244 |
245 $ hg fatelogjson --hidden |
245 $ hg fatelogjson --hidden |
246 @ d004c8f274b9 "" |
246 @ d004c8f274b9 [] |
247 | |
247 | |
248 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] |
248 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] |
249 |/ |
249 |/ |
250 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] |
250 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] |
251 |/ |
251 |/ |
252 o ea207398892e "" |
252 o ea207398892e [] |
253 |
253 |
254 |
254 |
255 Test templates with splitted commit |
255 Test templates with splitted commit |
256 =================================== |
256 =================================== |
257 |
257 |
324 | summary: A0 |
324 | summary: A0 |
325 | |
325 | |
326 | x changeset: 1:471597cad322 |
326 | x changeset: 1:471597cad322 |
327 |/ user: test |
327 |/ user: test |
328 | date: Thu Jan 01 00:00:00 1970 +0000 |
328 | date: Thu Jan 01 00:00:00 1970 +0000 |
329 | obsolete: split as 337fec4d2edc, f257fde29c7a |
329 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a |
330 | summary: A0 |
330 | summary: A0 |
331 | |
331 | |
332 o changeset: 0:ea207398892e |
332 o changeset: 0:ea207398892e |
333 user: test |
333 user: test |
334 date: Thu Jan 01 00:00:00 1970 +0000 |
334 date: Thu Jan 01 00:00:00 1970 +0000 |
344 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
344 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
345 |
345 |
346 Precursors template should show current revision as it is the working copy |
346 Precursors template should show current revision as it is the working copy |
347 $ hg tlog |
347 $ hg tlog |
348 o f257fde29c7a |
348 o f257fde29c7a |
349 | Precursors: 471597cad322 |
349 | Precursors: 1:471597cad322 |
350 | semi-colon: 471597cad322 |
350 | semi-colon: 1:471597cad322 |
351 o 337fec4d2edc |
351 o 337fec4d2edc |
352 | Precursors: 471597cad322 |
352 | Precursors: 1:471597cad322 |
353 | semi-colon: 471597cad322 |
353 | semi-colon: 1:471597cad322 |
354 | @ 471597cad322 |
354 | @ 471597cad322 |
355 |/ Successors: [337fec4d2edc, f257fde29c7a] |
355 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
356 | semi-colon: [337fec4d2edc, f257fde29c7a] |
356 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
357 | Fate: split as 337fec4d2edc, f257fde29c7a |
357 | Fate: split as 2:337fec4d2edc, 3:f257fde29c7a |
358 | |
358 | |
359 o ea207398892e |
359 o ea207398892e |
360 |
360 |
361 $ hg fatelog |
361 $ hg fatelog |
362 o f257fde29c7a |
362 o f257fde29c7a |
363 | |
363 | |
364 o 337fec4d2edc |
364 o 337fec4d2edc |
365 | |
365 | |
366 | @ 471597cad322 |
366 | @ 471597cad322 |
367 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
367 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
368 | |
368 | |
369 o ea207398892e |
369 o ea207398892e |
370 |
370 |
371 |
371 |
372 $ hg up f257fde29c7a |
372 $ hg up f257fde29c7a |
383 |
383 |
384 Precursors template should show the precursor as we force its display with |
384 Precursors template should show the precursor as we force its display with |
385 --hidden |
385 --hidden |
386 $ hg tlog --hidden |
386 $ hg tlog --hidden |
387 @ f257fde29c7a |
387 @ f257fde29c7a |
388 | Precursors: 471597cad322 |
388 | Precursors: 1:471597cad322 |
389 | semi-colon: 471597cad322 |
389 | semi-colon: 1:471597cad322 |
390 o 337fec4d2edc |
390 o 337fec4d2edc |
391 | Precursors: 471597cad322 |
391 | Precursors: 1:471597cad322 |
392 | semi-colon: 471597cad322 |
392 | semi-colon: 1:471597cad322 |
393 | x 471597cad322 |
393 | x 471597cad322 |
394 |/ Successors: [337fec4d2edc, f257fde29c7a] |
394 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
395 | semi-colon: [337fec4d2edc, f257fde29c7a] |
395 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
396 | Fate: split as 337fec4d2edc, f257fde29c7a |
396 | Fate: split as 2:337fec4d2edc, 3:f257fde29c7a |
397 | |
397 | |
398 o ea207398892e |
398 o ea207398892e |
399 |
399 |
400 $ hg fatelog --hidden |
400 $ hg fatelog --hidden |
401 @ f257fde29c7a |
401 @ f257fde29c7a |
402 | |
402 | |
403 o 337fec4d2edc |
403 o 337fec4d2edc |
404 | |
404 | |
405 | x 471597cad322 |
405 | x 471597cad322 |
406 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
406 |/ Obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a |
407 | |
407 | |
408 o ea207398892e |
408 o ea207398892e |
409 |
409 |
410 |
410 |
411 $ hg fatelogjson --hidden |
411 $ hg fatelogjson --hidden |
412 @ f257fde29c7a "" |
412 @ f257fde29c7a [] |
413 | |
413 | |
414 o 337fec4d2edc "" |
414 o 337fec4d2edc [] |
415 | |
415 | |
416 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] |
416 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] |
417 |/ |
417 |/ |
418 o ea207398892e "" |
418 o ea207398892e [] |
419 |
419 |
420 |
420 |
421 Test templates with folded commit |
421 Test templates with folded commit |
422 ============================== |
422 ============================== |
423 |
423 |
458 | summary: C0 |
458 | summary: C0 |
459 | |
459 | |
460 | x changeset: 2:0dec01379d3b |
460 | x changeset: 2:0dec01379d3b |
461 | | user: test |
461 | | user: test |
462 | | date: Thu Jan 01 00:00:00 1970 +0000 |
462 | | date: Thu Jan 01 00:00:00 1970 +0000 |
463 | | obsolete: rewritten as eb5a0daa2192 |
463 | | obsolete: rewritten as 3:eb5a0daa2192 |
464 | | summary: B0 |
464 | | summary: B0 |
465 | | |
465 | | |
466 | x changeset: 1:471f378eab4c |
466 | x changeset: 1:471f378eab4c |
467 |/ user: test |
467 |/ user: test |
468 | date: Thu Jan 01 00:00:00 1970 +0000 |
468 | date: Thu Jan 01 00:00:00 1970 +0000 |
469 | obsolete: rewritten as eb5a0daa2192 |
469 | obsolete: rewritten as 3:eb5a0daa2192 |
470 | summary: A0 |
470 | summary: A0 |
471 | |
471 | |
472 o changeset: 0:ea207398892e |
472 o changeset: 0:ea207398892e |
473 user: test |
473 user: test |
474 date: Thu Jan 01 00:00:00 1970 +0000 |
474 date: Thu Jan 01 00:00:00 1970 +0000 |
483 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
483 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
484 |
484 |
485 Precursors template should show current revision as it is the working copy |
485 Precursors template should show current revision as it is the working copy |
486 $ hg tlog |
486 $ hg tlog |
487 o eb5a0daa2192 |
487 o eb5a0daa2192 |
488 | Precursors: 471f378eab4c |
488 | Precursors: 1:471f378eab4c |
489 | semi-colon: 471f378eab4c |
489 | semi-colon: 1:471f378eab4c |
490 | @ 471f378eab4c |
490 | @ 471f378eab4c |
491 |/ Successors: [eb5a0daa2192] |
491 |/ Successors: 3:eb5a0daa2192 |
492 | semi-colon: [eb5a0daa2192] |
492 | semi-colon: 3:eb5a0daa2192 |
493 | Fate: rewritten as eb5a0daa2192 |
493 | Fate: rewritten as 3:eb5a0daa2192 |
494 | |
494 | |
495 o ea207398892e |
495 o ea207398892e |
496 |
496 |
497 $ hg fatelog |
497 $ hg fatelog |
498 o eb5a0daa2192 |
498 o eb5a0daa2192 |
499 | |
499 | |
500 | @ 471f378eab4c |
500 | @ 471f378eab4c |
501 |/ Obsfate: rewritten as eb5a0daa2192 |
501 |/ Obsfate: rewritten as 3:eb5a0daa2192 |
502 | |
502 | |
503 o ea207398892e |
503 o ea207398892e |
504 |
504 |
505 $ hg up 'desc(B0)' --hidden |
505 $ hg up 'desc(B0)' --hidden |
506 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
506 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
509 |
509 |
510 Precursors template should show both precursors as they should be both |
510 Precursors template should show both precursors as they should be both |
511 displayed |
511 displayed |
512 $ hg tlog |
512 $ hg tlog |
513 o eb5a0daa2192 |
513 o eb5a0daa2192 |
514 | Precursors: 0dec01379d3b 471f378eab4c |
514 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
515 | semi-colon: 0dec01379d3b; 471f378eab4c |
515 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
516 | @ 0dec01379d3b |
516 | @ 0dec01379d3b |
517 | | Successors: [eb5a0daa2192] |
517 | | Successors: 3:eb5a0daa2192 |
518 | | semi-colon: [eb5a0daa2192] |
518 | | semi-colon: 3:eb5a0daa2192 |
519 | | Fate: rewritten as eb5a0daa2192 |
519 | | Fate: rewritten as 3:eb5a0daa2192 |
520 | | |
520 | | |
521 | x 471f378eab4c |
521 | x 471f378eab4c |
522 |/ Successors: [eb5a0daa2192] |
522 |/ Successors: 3:eb5a0daa2192 |
523 | semi-colon: [eb5a0daa2192] |
523 | semi-colon: 3:eb5a0daa2192 |
524 | Fate: rewritten as eb5a0daa2192 |
524 | Fate: rewritten as 3:eb5a0daa2192 |
525 | |
525 | |
526 o ea207398892e |
526 o ea207398892e |
527 |
527 |
528 $ hg fatelog |
528 $ hg fatelog |
529 o eb5a0daa2192 |
529 o eb5a0daa2192 |
530 | |
530 | |
531 | @ 0dec01379d3b |
531 | @ 0dec01379d3b |
532 | | Obsfate: rewritten as eb5a0daa2192 |
532 | | Obsfate: rewritten as 3:eb5a0daa2192 |
533 | | |
533 | | |
534 | x 471f378eab4c |
534 | x 471f378eab4c |
535 |/ Obsfate: rewritten as eb5a0daa2192 |
535 |/ Obsfate: rewritten as 3:eb5a0daa2192 |
536 | |
536 | |
537 o ea207398892e |
537 o ea207398892e |
538 |
538 |
539 |
539 |
540 $ hg up 'desc(C0)' |
540 $ hg up 'desc(C0)' |
549 |
549 |
550 Precursors template should show both precursors as we force its display with |
550 Precursors template should show both precursors as we force its display with |
551 --hidden |
551 --hidden |
552 $ hg tlog --hidden |
552 $ hg tlog --hidden |
553 @ eb5a0daa2192 |
553 @ eb5a0daa2192 |
554 | Precursors: 0dec01379d3b 471f378eab4c |
554 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
555 | semi-colon: 0dec01379d3b; 471f378eab4c |
555 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
556 | x 0dec01379d3b |
556 | x 0dec01379d3b |
557 | | Successors: [eb5a0daa2192] |
557 | | Successors: 3:eb5a0daa2192 |
558 | | semi-colon: [eb5a0daa2192] |
558 | | semi-colon: 3:eb5a0daa2192 |
559 | | Fate: rewritten as eb5a0daa2192 |
559 | | Fate: rewritten as 3:eb5a0daa2192 |
560 | | |
560 | | |
561 | x 471f378eab4c |
561 | x 471f378eab4c |
562 |/ Successors: [eb5a0daa2192] |
562 |/ Successors: 3:eb5a0daa2192 |
563 | semi-colon: [eb5a0daa2192] |
563 | semi-colon: 3:eb5a0daa2192 |
564 | Fate: rewritten as eb5a0daa2192 |
564 | Fate: rewritten as 3:eb5a0daa2192 |
565 | |
565 | |
566 o ea207398892e |
566 o ea207398892e |
567 |
567 |
568 $ hg fatelog --hidden |
568 $ hg fatelog --hidden |
569 @ eb5a0daa2192 |
569 @ eb5a0daa2192 |
570 | |
570 | |
571 | x 0dec01379d3b |
571 | x 0dec01379d3b |
572 | | Obsfate: rewritten as eb5a0daa2192 |
572 | | Obsfate: rewritten as 3:eb5a0daa2192 |
573 | | |
573 | | |
574 | x 471f378eab4c |
574 | x 471f378eab4c |
575 |/ Obsfate: rewritten as eb5a0daa2192 |
575 |/ Obsfate: rewritten as 3:eb5a0daa2192 |
576 | |
576 | |
577 o ea207398892e |
577 o ea207398892e |
578 |
578 |
579 |
579 |
580 $ hg fatelogjson --hidden |
580 $ hg fatelogjson --hidden |
581 @ eb5a0daa2192 "" |
581 @ eb5a0daa2192 [] |
582 | |
582 | |
583 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
583 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
584 | | |
584 | | |
585 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
585 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
586 |/ |
586 |/ |
587 o ea207398892e "" |
587 o ea207398892e [] |
588 |
588 |
589 |
589 |
590 Test templates with divergence |
590 Test templates with divergence |
591 ============================== |
591 ============================== |
592 |
592 |
607 | summary: A1 |
607 | summary: A1 |
608 | |
608 | |
609 | x changeset: 1:471f378eab4c |
609 | x changeset: 1:471f378eab4c |
610 |/ user: test |
610 |/ user: test |
611 | date: Thu Jan 01 00:00:00 1970 +0000 |
611 | date: Thu Jan 01 00:00:00 1970 +0000 |
612 | obsolete: reworded as fdf9bde5129a |
612 | obsolete: reworded as 2:fdf9bde5129a |
613 | summary: A0 |
613 | summary: A0 |
614 | |
614 | |
615 o changeset: 0:ea207398892e |
615 o changeset: 0:ea207398892e |
616 user: test |
616 user: test |
617 date: Thu Jan 01 00:00:00 1970 +0000 |
617 date: Thu Jan 01 00:00:00 1970 +0000 |
640 | summary: A1 |
640 | summary: A1 |
641 | |
641 | |
642 | x changeset: 1:471f378eab4c |
642 | x changeset: 1:471f378eab4c |
643 |/ user: test |
643 |/ user: test |
644 | date: Thu Jan 01 00:00:00 1970 +0000 |
644 | date: Thu Jan 01 00:00:00 1970 +0000 |
645 | obsolete: reworded as fdf9bde5129a |
645 | obsolete: reworded as 2:fdf9bde5129a |
646 | obsolete: reworded as 65b757b745b9 |
646 | obsolete: reworded as 3:65b757b745b9 |
647 | summary: A0 |
647 | summary: A0 |
648 | |
648 | |
649 o changeset: 0:ea207398892e |
649 o changeset: 0:ea207398892e |
650 user: test |
650 user: test |
651 date: Thu Jan 01 00:00:00 1970 +0000 |
651 date: Thu Jan 01 00:00:00 1970 +0000 |
662 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
662 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
663 |
663 |
664 Precursors template should show current revision as it is the working copy |
664 Precursors template should show current revision as it is the working copy |
665 $ hg tlog |
665 $ hg tlog |
666 o 019fadeab383 |
666 o 019fadeab383 |
667 | Precursors: 471f378eab4c |
667 | Precursors: 1:471f378eab4c |
668 | semi-colon: 471f378eab4c |
668 | semi-colon: 1:471f378eab4c |
669 | o fdf9bde5129a |
669 | o fdf9bde5129a |
670 |/ Precursors: 471f378eab4c |
670 |/ Precursors: 1:471f378eab4c |
671 | semi-colon: 471f378eab4c |
671 | semi-colon: 1:471f378eab4c |
672 | @ 471f378eab4c |
672 | @ 471f378eab4c |
673 |/ Successors: [fdf9bde5129a], [019fadeab383] |
673 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
674 | semi-colon: [fdf9bde5129a]; [019fadeab383] |
674 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
675 | Fate: reworded as fdf9bde5129a |
675 | Fate: reworded as 2:fdf9bde5129a |
676 | Fate: reworded as 019fadeab383 |
676 | Fate: reworded as 4:019fadeab383 |
677 | |
677 | |
678 o ea207398892e |
678 o ea207398892e |
679 |
679 |
680 $ hg fatelog |
680 $ hg fatelog |
681 o 019fadeab383 |
681 o 019fadeab383 |
682 | |
682 | |
683 | o fdf9bde5129a |
683 | o fdf9bde5129a |
684 |/ |
684 |/ |
685 | @ 471f378eab4c |
685 | @ 471f378eab4c |
686 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383 |
686 |/ Obsfate: reworded as 2:fdf9bde5129a; reworded as 4:019fadeab383 |
687 | |
687 | |
688 o ea207398892e |
688 o ea207398892e |
689 |
689 |
690 |
690 |
691 $ hg up 'desc(A1)' |
691 $ hg up 'desc(A1)' |
708 o ea207398892e |
708 o ea207398892e |
709 |
709 |
710 Precursors template should a precursor as we force its display with --hidden |
710 Precursors template should a precursor as we force its display with --hidden |
711 $ hg tlog --hidden |
711 $ hg tlog --hidden |
712 o 019fadeab383 |
712 o 019fadeab383 |
713 | Precursors: 65b757b745b9 |
713 | Precursors: 3:65b757b745b9 |
714 | semi-colon: 65b757b745b9 |
714 | semi-colon: 3:65b757b745b9 |
715 | x 65b757b745b9 |
715 | x 65b757b745b9 |
716 |/ Precursors: 471f378eab4c |
716 |/ Precursors: 1:471f378eab4c |
717 | semi-colon: 471f378eab4c |
717 | semi-colon: 1:471f378eab4c |
718 | Successors: [019fadeab383] |
718 | Successors: 4:019fadeab383 |
719 | semi-colon: [019fadeab383] |
719 | semi-colon: 4:019fadeab383 |
720 | Fate: reworded as 019fadeab383 |
720 | Fate: reworded as 4:019fadeab383 |
721 | |
721 | |
722 | @ fdf9bde5129a |
722 | @ fdf9bde5129a |
723 |/ Precursors: 471f378eab4c |
723 |/ Precursors: 1:471f378eab4c |
724 | semi-colon: 471f378eab4c |
724 | semi-colon: 1:471f378eab4c |
725 | x 471f378eab4c |
725 | x 471f378eab4c |
726 |/ Successors: [fdf9bde5129a], [65b757b745b9] |
726 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
727 | semi-colon: [fdf9bde5129a]; [65b757b745b9] |
727 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
728 | Fate: reworded as fdf9bde5129a |
728 | Fate: reworded as 2:fdf9bde5129a |
729 | Fate: reworded as 65b757b745b9 |
729 | Fate: reworded as 3:65b757b745b9 |
730 | |
730 | |
731 o ea207398892e |
731 o ea207398892e |
732 |
732 |
733 $ hg fatelog --hidden |
733 $ hg fatelog --hidden |
734 o 019fadeab383 |
734 o 019fadeab383 |
735 | |
735 | |
736 | x 65b757b745b9 |
736 | x 65b757b745b9 |
737 |/ Obsfate: reworded as 019fadeab383 |
737 |/ Obsfate: reworded as 4:019fadeab383 |
738 | |
738 | |
739 | @ fdf9bde5129a |
739 | @ fdf9bde5129a |
740 |/ |
740 |/ |
741 | x 471f378eab4c |
741 | x 471f378eab4c |
742 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9 |
742 |/ Obsfate: reworded as 2:fdf9bde5129a; reworded as 3:65b757b745b9 |
743 | |
743 | |
744 o ea207398892e |
744 o ea207398892e |
745 |
745 |
746 |
746 |
747 $ hg fatelogjson --hidden |
747 $ hg fatelogjson --hidden |
748 o 019fadeab383 "" |
748 o 019fadeab383 [] |
749 | |
749 | |
750 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] |
750 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] |
751 |/ |
751 |/ |
752 | @ fdf9bde5129a "" |
752 | @ fdf9bde5129a [] |
753 |/ |
753 |/ |
754 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] |
754 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] |
755 |/ |
755 |/ |
756 o ea207398892e "" |
756 o ea207398892e [] |
757 |
757 |
758 |
758 |
759 Test templates with amended + folded commit |
759 Test templates with amended + folded commit |
760 =========================================== |
760 =========================================== |
761 |
761 |
777 | summary: B1 |
777 | summary: B1 |
778 | |
778 | |
779 | x changeset: 2:0dec01379d3b |
779 | x changeset: 2:0dec01379d3b |
780 |/ user: test |
780 |/ user: test |
781 | date: Thu Jan 01 00:00:00 1970 +0000 |
781 | date: Thu Jan 01 00:00:00 1970 +0000 |
782 | obsolete: reworded as b7ea6d14e664 |
782 | obsolete: reworded as 3:b7ea6d14e664 |
783 | summary: B0 |
783 | summary: B0 |
784 | |
784 | |
785 o changeset: 1:471f378eab4c |
785 o changeset: 1:471f378eab4c |
786 | user: test |
786 | user: test |
787 | date: Thu Jan 01 00:00:00 1970 +0000 |
787 | date: Thu Jan 01 00:00:00 1970 +0000 |
805 | |
805 | |
806 | x changeset: 3:b7ea6d14e664 |
806 | x changeset: 3:b7ea6d14e664 |
807 | | parent: 1:471f378eab4c |
807 | | parent: 1:471f378eab4c |
808 | | user: test |
808 | | user: test |
809 | | date: Thu Jan 01 00:00:00 1970 +0000 |
809 | | date: Thu Jan 01 00:00:00 1970 +0000 |
810 | | obsolete: rewritten as eb5a0daa2192 |
810 | | obsolete: rewritten as 4:eb5a0daa2192 |
811 | | summary: B1 |
811 | | summary: B1 |
812 | | |
812 | | |
813 | | x changeset: 2:0dec01379d3b |
813 | | x changeset: 2:0dec01379d3b |
814 | |/ user: test |
814 | |/ user: test |
815 | | date: Thu Jan 01 00:00:00 1970 +0000 |
815 | | date: Thu Jan 01 00:00:00 1970 +0000 |
816 | | obsolete: reworded as b7ea6d14e664 |
816 | | obsolete: reworded as 3:b7ea6d14e664 |
817 | | summary: B0 |
817 | | summary: B0 |
818 | | |
818 | | |
819 | x changeset: 1:471f378eab4c |
819 | x changeset: 1:471f378eab4c |
820 |/ user: test |
820 |/ user: test |
821 | date: Thu Jan 01 00:00:00 1970 +0000 |
821 | date: Thu Jan 01 00:00:00 1970 +0000 |
822 | obsolete: rewritten as eb5a0daa2192 |
822 | obsolete: rewritten as 4:eb5a0daa2192 |
823 | summary: A0 |
823 | summary: A0 |
824 | |
824 | |
825 o changeset: 0:ea207398892e |
825 o changeset: 0:ea207398892e |
826 user: test |
826 user: test |
827 date: Thu Jan 01 00:00:00 1970 +0000 |
827 date: Thu Jan 01 00:00:00 1970 +0000 |
834 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
834 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
835 working directory parent is obsolete! (471f378eab4c) |
835 working directory parent is obsolete! (471f378eab4c) |
836 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
836 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
837 $ hg tlog |
837 $ hg tlog |
838 o eb5a0daa2192 |
838 o eb5a0daa2192 |
839 | Precursors: 471f378eab4c |
839 | Precursors: 1:471f378eab4c |
840 | semi-colon: 471f378eab4c |
840 | semi-colon: 1:471f378eab4c |
841 | @ 471f378eab4c |
841 | @ 471f378eab4c |
842 |/ Successors: [eb5a0daa2192] |
842 |/ Successors: 4:eb5a0daa2192 |
843 | semi-colon: [eb5a0daa2192] |
843 | semi-colon: 4:eb5a0daa2192 |
844 | Fate: rewritten as eb5a0daa2192 |
844 | Fate: rewritten as 4:eb5a0daa2192 |
845 | |
845 | |
846 o ea207398892e |
846 o ea207398892e |
847 |
847 |
848 $ hg fatelog |
848 $ hg fatelog |
849 o eb5a0daa2192 |
849 o eb5a0daa2192 |
850 | |
850 | |
851 | @ 471f378eab4c |
851 | @ 471f378eab4c |
852 |/ Obsfate: rewritten as eb5a0daa2192 |
852 |/ Obsfate: rewritten as 4:eb5a0daa2192 |
853 | |
853 | |
854 o ea207398892e |
854 o ea207398892e |
855 |
855 |
856 $ hg up 'desc(B0)' --hidden |
856 $ hg up 'desc(B0)' --hidden |
857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
858 working directory parent is obsolete! (0dec01379d3b) |
858 working directory parent is obsolete! (0dec01379d3b) |
859 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
859 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
860 $ hg tlog |
860 $ hg tlog |
861 o eb5a0daa2192 |
861 o eb5a0daa2192 |
862 | Precursors: 0dec01379d3b 471f378eab4c |
862 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
863 | semi-colon: 0dec01379d3b; 471f378eab4c |
863 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
864 | @ 0dec01379d3b |
864 | @ 0dec01379d3b |
865 | | Successors: [eb5a0daa2192] |
865 | | Successors: 4:eb5a0daa2192 |
866 | | semi-colon: [eb5a0daa2192] |
866 | | semi-colon: 4:eb5a0daa2192 |
867 | | Fate: rewritten as eb5a0daa2192 |
867 | | Fate: rewritten as 4:eb5a0daa2192 |
868 | | |
868 | | |
869 | x 471f378eab4c |
869 | x 471f378eab4c |
870 |/ Successors: [eb5a0daa2192] |
870 |/ Successors: 4:eb5a0daa2192 |
871 | semi-colon: [eb5a0daa2192] |
871 | semi-colon: 4:eb5a0daa2192 |
872 | Fate: rewritten as eb5a0daa2192 |
872 | Fate: rewritten as 4:eb5a0daa2192 |
873 | |
873 | |
874 o ea207398892e |
874 o ea207398892e |
875 |
875 |
876 $ hg fatelog |
876 $ hg fatelog |
877 o eb5a0daa2192 |
877 o eb5a0daa2192 |
878 | |
878 | |
879 | @ 0dec01379d3b |
879 | @ 0dec01379d3b |
880 | | Obsfate: rewritten as eb5a0daa2192 |
880 | | Obsfate: rewritten as 4:eb5a0daa2192 |
881 | | |
881 | | |
882 | x 471f378eab4c |
882 | x 471f378eab4c |
883 |/ Obsfate: rewritten as eb5a0daa2192 |
883 |/ Obsfate: rewritten as 4:eb5a0daa2192 |
884 | |
884 | |
885 o ea207398892e |
885 o ea207398892e |
886 |
886 |
887 |
887 |
888 $ hg up 'desc(B1)' --hidden |
888 $ hg up 'desc(B1)' --hidden |
889 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
889 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
890 working directory parent is obsolete! (b7ea6d14e664) |
890 working directory parent is obsolete! (b7ea6d14e664) |
891 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
891 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
892 $ hg tlog |
892 $ hg tlog |
893 o eb5a0daa2192 |
893 o eb5a0daa2192 |
894 | Precursors: 471f378eab4c b7ea6d14e664 |
894 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 |
895 | semi-colon: 471f378eab4c; b7ea6d14e664 |
895 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
896 | @ b7ea6d14e664 |
896 | @ b7ea6d14e664 |
897 | | Successors: [eb5a0daa2192] |
897 | | Successors: 4:eb5a0daa2192 |
898 | | semi-colon: [eb5a0daa2192] |
898 | | semi-colon: 4:eb5a0daa2192 |
899 | | Fate: rewritten as eb5a0daa2192 |
899 | | Fate: rewritten as 4:eb5a0daa2192 |
900 | | |
900 | | |
901 | x 471f378eab4c |
901 | x 471f378eab4c |
902 |/ Successors: [eb5a0daa2192] |
902 |/ Successors: 4:eb5a0daa2192 |
903 | semi-colon: [eb5a0daa2192] |
903 | semi-colon: 4:eb5a0daa2192 |
904 | Fate: rewritten as eb5a0daa2192 |
904 | Fate: rewritten as 4:eb5a0daa2192 |
905 | |
905 | |
906 o ea207398892e |
906 o ea207398892e |
907 |
907 |
908 $ hg fatelog |
908 $ hg fatelog |
909 o eb5a0daa2192 |
909 o eb5a0daa2192 |
910 | |
910 | |
911 | @ b7ea6d14e664 |
911 | @ b7ea6d14e664 |
912 | | Obsfate: rewritten as eb5a0daa2192 |
912 | | Obsfate: rewritten as 4:eb5a0daa2192 |
913 | | |
913 | | |
914 | x 471f378eab4c |
914 | x 471f378eab4c |
915 |/ Obsfate: rewritten as eb5a0daa2192 |
915 |/ Obsfate: rewritten as 4:eb5a0daa2192 |
916 | |
916 | |
917 o ea207398892e |
917 o ea207398892e |
918 |
918 |
919 |
919 |
920 $ hg up 'desc(C0)' |
920 $ hg up 'desc(C0)' |
924 | |
924 | |
925 o ea207398892e |
925 o ea207398892e |
926 |
926 |
927 $ hg tlog --hidden |
927 $ hg tlog --hidden |
928 @ eb5a0daa2192 |
928 @ eb5a0daa2192 |
929 | Precursors: 471f378eab4c b7ea6d14e664 |
929 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 |
930 | semi-colon: 471f378eab4c; b7ea6d14e664 |
930 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
931 | x b7ea6d14e664 |
931 | x b7ea6d14e664 |
932 | | Precursors: 0dec01379d3b |
932 | | Precursors: 2:0dec01379d3b |
933 | | semi-colon: 0dec01379d3b |
933 | | semi-colon: 2:0dec01379d3b |
934 | | Successors: [eb5a0daa2192] |
934 | | Successors: 4:eb5a0daa2192 |
935 | | semi-colon: [eb5a0daa2192] |
935 | | semi-colon: 4:eb5a0daa2192 |
936 | | Fate: rewritten as eb5a0daa2192 |
936 | | Fate: rewritten as 4:eb5a0daa2192 |
937 | | |
937 | | |
938 | | x 0dec01379d3b |
938 | | x 0dec01379d3b |
939 | |/ Successors: [b7ea6d14e664] |
939 | |/ Successors: 3:b7ea6d14e664 |
940 | | semi-colon: [b7ea6d14e664] |
940 | | semi-colon: 3:b7ea6d14e664 |
941 | | Fate: reworded as b7ea6d14e664 |
941 | | Fate: reworded as 3:b7ea6d14e664 |
942 | | |
942 | | |
943 | x 471f378eab4c |
943 | x 471f378eab4c |
944 |/ Successors: [eb5a0daa2192] |
944 |/ Successors: 4:eb5a0daa2192 |
945 | semi-colon: [eb5a0daa2192] |
945 | semi-colon: 4:eb5a0daa2192 |
946 | Fate: rewritten as eb5a0daa2192 |
946 | Fate: rewritten as 4:eb5a0daa2192 |
947 | |
947 | |
948 o ea207398892e |
948 o ea207398892e |
949 |
949 |
950 $ hg fatelog --hidden |
950 $ hg fatelog --hidden |
951 @ eb5a0daa2192 |
951 @ eb5a0daa2192 |
952 | |
952 | |
953 | x b7ea6d14e664 |
953 | x b7ea6d14e664 |
954 | | Obsfate: rewritten as eb5a0daa2192 |
954 | | Obsfate: rewritten as 4:eb5a0daa2192 |
955 | | |
955 | | |
956 | | x 0dec01379d3b |
956 | | x 0dec01379d3b |
957 | |/ Obsfate: reworded as b7ea6d14e664 |
957 | |/ Obsfate: reworded as 3:b7ea6d14e664 |
958 | | |
958 | | |
959 | x 471f378eab4c |
959 | x 471f378eab4c |
960 |/ Obsfate: rewritten as eb5a0daa2192 |
960 |/ Obsfate: rewritten as 4:eb5a0daa2192 |
961 | |
961 | |
962 o ea207398892e |
962 o ea207398892e |
963 |
963 |
964 $ hg fatelogjson --hidden |
964 $ hg fatelogjson --hidden |
965 @ eb5a0daa2192 "" |
965 @ eb5a0daa2192 [] |
966 | |
966 | |
967 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
967 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
968 | | |
968 | | |
969 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] |
969 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] |
970 | |/ |
970 | |/ |
971 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
971 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
972 |/ |
972 |/ |
973 o ea207398892e "" |
973 o ea207398892e [] |
974 |
974 |
975 |
975 |
976 Test template with pushed and pulled obs markers |
976 Test template with pushed and pulled obs markers |
977 ============================================== |
977 ============================================== |
978 |
978 |
1012 | |
1012 | |
1013 | x changeset: 2:fdf9bde5129a |
1013 | x changeset: 2:fdf9bde5129a |
1014 |/ parent: 0:ea207398892e |
1014 |/ parent: 0:ea207398892e |
1015 | user: test |
1015 | user: test |
1016 | date: Thu Jan 01 00:00:00 1970 +0000 |
1016 | date: Thu Jan 01 00:00:00 1970 +0000 |
1017 | obsolete: reworded as 7a230b46bf61 |
1017 | obsolete: reworded as 3:7a230b46bf61 |
1018 | summary: A1 |
1018 | summary: A1 |
1019 | |
1019 | |
1020 | x changeset: 1:471f378eab4c |
1020 | x changeset: 1:471f378eab4c |
1021 |/ user: test |
1021 |/ user: test |
1022 | date: Thu Jan 01 00:00:00 1970 +0000 |
1022 | date: Thu Jan 01 00:00:00 1970 +0000 |
1023 | obsolete: reworded as fdf9bde5129a |
1023 | obsolete: reworded as 2:fdf9bde5129a |
1024 | summary: A0 |
1024 | summary: A0 |
1025 | |
1025 | |
1026 o changeset: 0:ea207398892e |
1026 o changeset: 0:ea207398892e |
1027 user: test |
1027 user: test |
1028 date: Thu Jan 01 00:00:00 1970 +0000 |
1028 date: Thu Jan 01 00:00:00 1970 +0000 |
1036 adding manifests |
1036 adding manifests |
1037 adding file changes |
1037 adding file changes |
1038 added 1 changesets with 0 changes to 1 files (+1 heads) |
1038 added 1 changesets with 0 changes to 1 files (+1 heads) |
1039 2 new obsolescence markers |
1039 2 new obsolescence markers |
1040 obsoleted 1 changesets |
1040 obsoleted 1 changesets |
1041 new changesets 7a230b46bf61 |
|
1041 (run 'hg heads' to see heads, 'hg merge' to merge) |
1042 (run 'hg heads' to see heads, 'hg merge' to merge) |
1042 working directory parent is obsolete! (471f378eab4c) |
1043 working directory parent is obsolete! (471f378eab4c) |
1043 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1044 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1044 $ hg log --hidden -G |
1045 $ hg log --hidden -G |
1045 o changeset: 2:7a230b46bf61 |
1046 o changeset: 2:7a230b46bf61 |
1050 | summary: A2 |
1051 | summary: A2 |
1051 | |
1052 | |
1052 | @ changeset: 1:471f378eab4c |
1053 | @ changeset: 1:471f378eab4c |
1053 |/ user: test |
1054 |/ user: test |
1054 | date: Thu Jan 01 00:00:00 1970 +0000 |
1055 | date: Thu Jan 01 00:00:00 1970 +0000 |
1055 | obsolete: reworded as 7a230b46bf61 |
1056 | obsolete: reworded as 2:7a230b46bf61 |
1056 | summary: A0 |
1057 | summary: A0 |
1057 | |
1058 | |
1058 o changeset: 0:ea207398892e |
1059 o changeset: 0:ea207398892e |
1059 user: test |
1060 user: test |
1060 date: Thu Jan 01 00:00:00 1970 +0000 |
1061 date: Thu Jan 01 00:00:00 1970 +0000 |
1063 Check templates |
1064 Check templates |
1064 --------------- |
1065 --------------- |
1065 |
1066 |
1066 $ hg tlog |
1067 $ hg tlog |
1067 o 7a230b46bf61 |
1068 o 7a230b46bf61 |
1068 | Precursors: 471f378eab4c |
1069 | Precursors: 1:471f378eab4c |
1069 | semi-colon: 471f378eab4c |
1070 | semi-colon: 1:471f378eab4c |
1070 | @ 471f378eab4c |
1071 | @ 471f378eab4c |
1071 |/ Successors: [7a230b46bf61] |
1072 |/ Successors: 2:7a230b46bf61 |
1072 | semi-colon: [7a230b46bf61] |
1073 | semi-colon: 2:7a230b46bf61 |
1073 | Fate: reworded as 7a230b46bf61 |
1074 | Fate: reworded as 2:7a230b46bf61 |
1074 | |
1075 | |
1075 o ea207398892e |
1076 o ea207398892e |
1076 |
1077 |
1077 $ hg fatelog --hidden -v |
1078 $ hg fatelog --hidden -v |
1078 o 7a230b46bf61 |
1079 o 7a230b46bf61 |
1079 | |
1080 | |
1080 | @ 471f378eab4c |
1081 | @ 471f378eab4c |
1081 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1082 |/ Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1082 | |
1083 | |
1083 o ea207398892e |
1084 o ea207398892e |
1084 |
1085 |
1085 $ hg up 'desc(A2)' |
1086 $ hg up 'desc(A2)' |
1086 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1087 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1094 | |
1095 | |
1095 o ea207398892e |
1096 o ea207398892e |
1096 |
1097 |
1097 $ hg tlog --hidden |
1098 $ hg tlog --hidden |
1098 @ 7a230b46bf61 |
1099 @ 7a230b46bf61 |
1099 | Precursors: 471f378eab4c |
1100 | Precursors: 1:471f378eab4c |
1100 | semi-colon: 471f378eab4c |
1101 | semi-colon: 1:471f378eab4c |
1101 | x 471f378eab4c |
1102 | x 471f378eab4c |
1102 |/ Successors: [7a230b46bf61] |
1103 |/ Successors: 2:7a230b46bf61 |
1103 | semi-colon: [7a230b46bf61] |
1104 | semi-colon: 2:7a230b46bf61 |
1104 | Fate: reworded as 7a230b46bf61 |
1105 | Fate: reworded as 2:7a230b46bf61 |
1105 | |
1106 | |
1106 o ea207398892e |
1107 o ea207398892e |
1107 |
1108 |
1108 $ hg fatelog --hidden -v |
1109 $ hg fatelog --hidden -v |
1109 @ 7a230b46bf61 |
1110 @ 7a230b46bf61 |
1110 | |
1111 | |
1111 | x 471f378eab4c |
1112 | x 471f378eab4c |
1112 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1113 |/ Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1113 | |
1114 | |
1114 o ea207398892e |
1115 o ea207398892e |
1115 |
1116 |
1116 |
1117 |
1117 $ hg fatelogjson --hidden |
1118 $ hg fatelogjson --hidden |
1118 @ 7a230b46bf61 "" |
1119 @ 7a230b46bf61 [] |
1119 | |
1120 | |
1120 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] |
1121 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] |
1121 |/ |
1122 |/ |
1122 o ea207398892e "" |
1123 o ea207398892e [] |
1123 |
1124 |
1124 |
1125 |
1125 Test templates with pruned commits |
1126 Test templates with pruned commits |
1126 ================================== |
1127 ================================== |
1127 |
1128 |