| branch | mercurial-4.3 |
| changeset 3591 | 98941c28f3e2 |
| parent 3590 | d5adce52cef4 |
| parent 3418 | 85cdce113c2c |
| child 3592 | 7a5c3175015e |
| child 3715 | a77fb9669e99 |
| 3590:d5adce52cef4 | 3591:98941c28f3e2 |
|---|---|
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} {obsfatedata|json}\n' |
22 > fatelogjson = log -G -T '{node|short} {obsfate|json}\n' |
23 > EOF |
23 > EOF |
24 |
24 |
25 Test templates on amended commit |
25 Test templates on amended commit |
26 ================================ |
26 ================================ |
27 |
27 |
34 $ mkcommit A0 |
34 $ mkcommit A0 |
35 $ echo 42 >> A0 |
35 $ echo 42 >> A0 |
36 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0" |
36 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0" |
37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0" |
37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0" |
38 $ hg log --hidden -G |
38 $ hg log --hidden -G |
39 @ changeset: 3:d004c8f274b9 |
39 @ changeset: 4:d004c8f274b9 |
40 | tag: tip |
40 | tag: tip |
41 | parent: 0:ea207398892e |
41 | parent: 0:ea207398892e |
42 | user: test |
42 | user: test |
43 | date: Thu Jan 01 00:00:00 1970 +0000 |
43 | date: Thu Jan 01 00:00:00 1970 +0000 |
44 | summary: A2 |
44 | summary: A2 |
45 | |
45 | |
46 | x changeset: 2:a468dc9b3633 |
46 | x changeset: 3: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 using amend as 3:d004c8f274b9 by test2 |
50 | obsolete: reworded as d004c8f274b9 by test2 |
51 | summary: A1 |
51 | summary: A1 |
52 | |
52 | |
53 | x changeset: 2:f137d23bb3e1 |
|
54 | | user: test |
|
55 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
56 | | obsolete: pruned |
|
57 | | summary: temporary amend commit for 471f378eab4c |
|
58 | | |
|
53 | x changeset: 1:471f378eab4c |
59 | x changeset: 1:471f378eab4c |
54 |/ user: test |
60 |/ user: test |
55 | date: Thu Jan 01 00:00:00 1970 +0000 |
61 | date: Thu Jan 01 00:00:00 1970 +0000 |
56 | obsolete: rewritten using amend as 2:a468dc9b3633 |
62 | obsolete: rewritten as a468dc9b3633 |
57 | summary: A0 |
63 | summary: A0 |
58 | |
64 | |
59 o changeset: 0:ea207398892e |
65 o changeset: 0:ea207398892e |
60 user: test |
66 user: test |
61 date: Thu Jan 01 00:00:00 1970 +0000 |
67 date: Thu Jan 01 00:00:00 1970 +0000 |
68 working directory parent is obsolete! (471f378eab4c) |
74 working directory parent is obsolete! (471f378eab4c) |
69 (use 'hg evolve' to update to its successor: d004c8f274b9) |
75 (use 'hg evolve' to update to its successor: d004c8f274b9) |
70 |
76 |
71 Precursors template should show current revision as it is the working copy |
77 Precursors template should show current revision as it is the working copy |
72 $ hg olog tip |
78 $ hg olog tip |
73 o d004c8f274b9 (3) A2 |
79 o d004c8f274b9 (4) A2 |
74 | |
80 | |
75 x a468dc9b3633 (2) A1 |
81 x a468dc9b3633 (3) A1 |
76 | rewritten(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000) |
82 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) |
77 | |
83 | |
78 @ 471f378eab4c (1) A0 |
84 @ 471f378eab4c (1) A0 |
79 rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000) |
85 rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000) |
80 |
86 |
81 $ hg tlog |
87 $ hg tlog |
82 o d004c8f274b9 |
88 o d004c8f274b9 |
83 | Precursors: 1:471f378eab4c |
89 | Precursors: 1:471f378eab4c |
84 | semi-colon: 1:471f378eab4c |
90 | semi-colon: 1:471f378eab4c |
85 | @ 471f378eab4c |
91 | @ 471f378eab4c |
86 |/ Successors: 3:d004c8f274b9 |
92 |/ Successors: 4:d004c8f274b9 |
87 | semi-colon: 3:d004c8f274b9 |
93 | semi-colon: 4:d004c8f274b9 |
88 | Fate: rewritten using amend as 3:d004c8f274b9 by test, test2 |
94 | Fate: rewritten as d004c8f274b9 by test, test2 |
89 | |
95 | |
90 o ea207398892e |
96 o ea207398892e |
91 |
97 |
92 |
98 |
93 $ hg log -G |
99 $ hg log -G |
94 o changeset: 3:d004c8f274b9 |
100 o changeset: 4:d004c8f274b9 |
95 | tag: tip |
101 | tag: tip |
96 | parent: 0:ea207398892e |
102 | parent: 0:ea207398892e |
97 | user: test |
103 | user: test |
98 | date: Thu Jan 01 00:00:00 1970 +0000 |
104 | date: Thu Jan 01 00:00:00 1970 +0000 |
99 | summary: A2 |
105 | summary: A2 |
100 | |
106 | |
101 | @ changeset: 1:471f378eab4c |
107 | @ changeset: 1:471f378eab4c |
102 |/ user: test |
108 |/ user: test |
103 | date: Thu Jan 01 00:00:00 1970 +0000 |
109 | date: Thu Jan 01 00:00:00 1970 +0000 |
104 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2 |
110 | obsolete: rewritten as d004c8f274b9 by test, test2 |
105 | summary: A0 |
111 | summary: A0 |
106 | |
112 | |
107 o changeset: 0:ea207398892e |
113 o changeset: 0:ea207398892e |
108 user: test |
114 user: test |
109 date: Thu Jan 01 00:00:00 1970 +0000 |
115 date: Thu Jan 01 00:00:00 1970 +0000 |
112 |
118 |
113 $ hg fatelog -q |
119 $ hg fatelog -q |
114 o d004c8f274b9 |
120 o d004c8f274b9 |
115 | |
121 | |
116 | @ 471f378eab4c |
122 | @ 471f378eab4c |
117 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 |
123 |/ Obsfate: rewritten as d004c8f274b9 |
118 | |
124 | |
119 o ea207398892e |
125 o ea207398892e |
120 |
126 |
121 |
127 |
122 $ hg fatelog |
128 $ hg fatelog |
123 o d004c8f274b9 |
129 o d004c8f274b9 |
124 | |
130 | |
125 | @ 471f378eab4c |
131 | @ 471f378eab4c |
126 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 |
132 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 |
127 | |
133 | |
128 o ea207398892e |
134 o ea207398892e |
129 |
135 |
130 $ hg fatelog -v |
136 $ hg fatelog -v |
131 o d004c8f274b9 |
137 o d004c8f274b9 |
132 | |
138 | |
133 | @ 471f378eab4c |
139 | @ 471f378eab4c |
134 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) |
140 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) |
135 | |
141 | |
136 o ea207398892e |
142 o ea207398892e |
137 |
143 |
138 |
144 |
139 (check json) |
145 (check json) |
160 (use 'hg evolve' to update to its successor: d004c8f274b9) |
166 (use 'hg evolve' to update to its successor: d004c8f274b9) |
161 |
167 |
162 Precursors template should show current revision as it is the working copy |
168 Precursors template should show current revision as it is the working copy |
163 $ hg tlog |
169 $ hg tlog |
164 o d004c8f274b9 |
170 o d004c8f274b9 |
165 | Precursors: 2:a468dc9b3633 |
171 | Precursors: 3:a468dc9b3633 |
166 | semi-colon: 2:a468dc9b3633 |
172 | semi-colon: 3:a468dc9b3633 |
167 | @ a468dc9b3633 |
173 | @ a468dc9b3633 |
168 |/ Successors: 3:d004c8f274b9 |
174 |/ Successors: 4:d004c8f274b9 |
169 | semi-colon: 3:d004c8f274b9 |
175 | semi-colon: 4:d004c8f274b9 |
170 | Fate: reworded using amend as 3:d004c8f274b9 by test2 |
176 | Fate: reworded as d004c8f274b9 by test2 |
171 | |
177 | |
172 o ea207398892e |
178 o ea207398892e |
173 |
179 |
174 Precursors template should show the precursor as we force its display with |
180 Precursors template should show the precursor as we force its display with |
175 --hidden |
181 --hidden |
176 $ hg tlog --hidden |
182 $ hg tlog --hidden |
177 o d004c8f274b9 |
183 o d004c8f274b9 |
178 | Precursors: 2:a468dc9b3633 |
184 | Precursors: 3:a468dc9b3633 |
179 | semi-colon: 2:a468dc9b3633 |
185 | semi-colon: 3:a468dc9b3633 |
180 | @ a468dc9b3633 |
186 | @ a468dc9b3633 |
181 |/ Precursors: 1:471f378eab4c |
187 |/ Precursors: 1:471f378eab4c |
182 | semi-colon: 1:471f378eab4c |
188 | semi-colon: 1:471f378eab4c |
183 | Successors: 3:d004c8f274b9 |
189 | Successors: 4:d004c8f274b9 |
184 | semi-colon: 3:d004c8f274b9 |
190 | semi-colon: 4:d004c8f274b9 |
185 | Fate: reworded using amend as 3:d004c8f274b9 by test2 |
191 | Fate: reworded as d004c8f274b9 by test2 |
186 | |
192 | |
187 | x 471f378eab4c |
193 | x f137d23bb3e1 |
188 |/ Successors: 2:a468dc9b3633 |
194 | | Fate: pruned |
189 | semi-colon: 2:a468dc9b3633 |
195 | | |
190 | Fate: rewritten using amend as 2:a468dc9b3633 |
196 | x 471f378eab4c |
191 | |
197 |/ Successors: 3:a468dc9b3633 |
192 o ea207398892e |
198 | semi-colon: 3:a468dc9b3633 |
193 |
199 | Fate: rewritten as a468dc9b3633 |
194 $ hg fatelog -v |
|
195 o d004c8f274b9 |
|
196 | |
|
197 | @ a468dc9b3633 |
|
198 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
|
199 | |
200 | |
200 o ea207398892e |
201 o ea207398892e |
201 |
202 |
202 $ hg up 'desc(A2)' |
203 $ hg up 'desc(A2)' |
203 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
204 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
206 | |
207 | |
207 o ea207398892e |
208 o ea207398892e |
208 |
209 |
209 $ hg tlog --hidden |
210 $ hg tlog --hidden |
210 @ d004c8f274b9 |
211 @ d004c8f274b9 |
211 | Precursors: 2:a468dc9b3633 |
212 | Precursors: 3:a468dc9b3633 |
212 | semi-colon: 2:a468dc9b3633 |
213 | semi-colon: 3:a468dc9b3633 |
213 | x a468dc9b3633 |
214 | x a468dc9b3633 |
214 |/ Precursors: 1:471f378eab4c |
215 |/ Precursors: 1:471f378eab4c |
215 | semi-colon: 1:471f378eab4c |
216 | semi-colon: 1:471f378eab4c |
216 | Successors: 3:d004c8f274b9 |
217 | Successors: 4:d004c8f274b9 |
217 | semi-colon: 3:d004c8f274b9 |
218 | semi-colon: 4:d004c8f274b9 |
218 | Fate: reworded using amend as 3:d004c8f274b9 by test2 |
219 | Fate: reworded as d004c8f274b9 by test2 |
219 | |
220 | |
220 | x 471f378eab4c |
221 | x f137d23bb3e1 |
221 |/ Successors: 2:a468dc9b3633 |
222 | | Fate: pruned |
222 | semi-colon: 2:a468dc9b3633 |
223 | | |
223 | Fate: rewritten using amend as 2:a468dc9b3633 |
224 | x 471f378eab4c |
225 |/ Successors: 3:a468dc9b3633 |
|
226 | semi-colon: 3:a468dc9b3633 |
|
227 | Fate: rewritten as a468dc9b3633 |
|
224 | |
228 | |
225 o ea207398892e |
229 o ea207398892e |
226 |
230 |
227 $ hg fatelog -v |
231 $ hg fatelog -v |
228 @ d004c8f274b9 |
232 @ d004c8f274b9 |
232 |
236 |
233 $ hg fatelog -v --hidden |
237 $ hg fatelog -v --hidden |
234 @ d004c8f274b9 |
238 @ d004c8f274b9 |
235 | |
239 | |
236 | x a468dc9b3633 |
240 | x a468dc9b3633 |
237 |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
241 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) |
238 | |
242 | |
239 | x 471f378eab4c |
243 | x f137d23bb3e1 |
240 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
244 | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000) |
245 | | |
|
246 | x 471f378eab4c |
|
247 |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
|
241 | |
248 | |
242 o ea207398892e |
249 o ea207398892e |
243 |
250 |
244 |
251 |
245 $ hg fatelogjson --hidden |
252 $ hg fatelogjson --hidden |
246 @ d004c8f274b9 [] |
253 @ d004c8f274b9 [] |
247 | |
254 | |
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"}] |
255 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] |
249 |/ |
256 |/ |
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"}] |
257 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}] |
258 | | |
|
259 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] |
|
251 |/ |
260 |/ |
252 o ea207398892e [] |
261 o ea207398892e [] |
253 |
262 |
254 |
263 |
255 Test templates with splitted commit |
264 Test templates with splitted commit |
324 | summary: A0 |
333 | summary: A0 |
325 | |
334 | |
326 | x changeset: 1:471597cad322 |
335 | x changeset: 1:471597cad322 |
327 |/ user: test |
336 |/ user: test |
328 | date: Thu Jan 01 00:00:00 1970 +0000 |
337 | date: Thu Jan 01 00:00:00 1970 +0000 |
329 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
338 | obsolete: split as 337fec4d2edc, f257fde29c7a |
330 | summary: A0 |
339 | summary: A0 |
331 | |
340 | |
332 o changeset: 0:ea207398892e |
341 o changeset: 0:ea207398892e |
333 user: test |
342 user: test |
334 date: Thu Jan 01 00:00:00 1970 +0000 |
343 date: Thu Jan 01 00:00:00 1970 +0000 |
352 | Precursors: 1:471597cad322 |
361 | Precursors: 1:471597cad322 |
353 | semi-colon: 1:471597cad322 |
362 | semi-colon: 1:471597cad322 |
354 | @ 471597cad322 |
363 | @ 471597cad322 |
355 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
364 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
356 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
365 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
357 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
366 | Fate: split as 337fec4d2edc, f257fde29c7a |
358 | |
367 | |
359 o ea207398892e |
368 o ea207398892e |
360 |
369 |
361 $ hg fatelog |
370 $ hg fatelog |
362 o f257fde29c7a |
371 o f257fde29c7a |
363 | |
372 | |
364 o 337fec4d2edc |
373 o 337fec4d2edc |
365 | |
374 | |
366 | @ 471597cad322 |
375 | @ 471597cad322 |
367 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
376 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
368 | |
377 | |
369 o ea207398892e |
378 o ea207398892e |
370 |
379 |
371 |
380 |
372 $ hg up f257fde29c7a |
381 $ hg up f257fde29c7a |
391 | Precursors: 1:471597cad322 |
400 | Precursors: 1:471597cad322 |
392 | semi-colon: 1:471597cad322 |
401 | semi-colon: 1:471597cad322 |
393 | x 471597cad322 |
402 | x 471597cad322 |
394 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
403 |/ Successors: 2:337fec4d2edc 3:f257fde29c7a |
395 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
404 | semi-colon: 2:337fec4d2edc 3:f257fde29c7a |
396 | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
405 | Fate: split as 337fec4d2edc, f257fde29c7a |
397 | |
406 | |
398 o ea207398892e |
407 o ea207398892e |
399 |
408 |
400 $ hg fatelog --hidden |
409 $ hg fatelog --hidden |
401 @ f257fde29c7a |
410 @ f257fde29c7a |
402 | |
411 | |
403 o 337fec4d2edc |
412 o 337fec4d2edc |
404 | |
413 | |
405 | x 471597cad322 |
414 | x 471597cad322 |
406 |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
415 |/ Obsfate: split as 337fec4d2edc, f257fde29c7a |
407 | |
416 | |
408 o ea207398892e |
417 o ea207398892e |
409 |
418 |
410 |
419 |
411 $ hg fatelogjson --hidden |
420 $ hg fatelogjson --hidden |
412 @ f257fde29c7a [] |
421 @ f257fde29c7a [] |
413 | |
422 | |
414 o 337fec4d2edc [] |
423 o 337fec4d2edc [] |
415 | |
424 | |
416 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["operation", "split"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] |
425 | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] |
417 |/ |
426 |/ |
418 o ea207398892e [] |
427 o ea207398892e [] |
419 |
428 |
420 |
429 |
421 Test templates with folded commit |
430 Test templates with folded commit |
458 | summary: C0 |
467 | summary: C0 |
459 | |
468 | |
460 | x changeset: 2:0dec01379d3b |
469 | x changeset: 2:0dec01379d3b |
461 | | user: test |
470 | | user: test |
462 | | date: Thu Jan 01 00:00:00 1970 +0000 |
471 | | date: Thu Jan 01 00:00:00 1970 +0000 |
463 | | obsolete: rewritten using fold as 3:eb5a0daa2192 |
472 | | obsolete: rewritten as eb5a0daa2192 |
464 | | summary: B0 |
473 | | summary: B0 |
465 | | |
474 | | |
466 | x changeset: 1:471f378eab4c |
475 | x changeset: 1:471f378eab4c |
467 |/ user: test |
476 |/ user: test |
468 | date: Thu Jan 01 00:00:00 1970 +0000 |
477 | date: Thu Jan 01 00:00:00 1970 +0000 |
469 | obsolete: rewritten using fold as 3:eb5a0daa2192 |
478 | obsolete: rewritten as eb5a0daa2192 |
470 | summary: A0 |
479 | summary: A0 |
471 | |
480 | |
472 o changeset: 0:ea207398892e |
481 o changeset: 0:ea207398892e |
473 user: test |
482 user: test |
474 date: Thu Jan 01 00:00:00 1970 +0000 |
483 date: Thu Jan 01 00:00:00 1970 +0000 |
488 | Precursors: 1:471f378eab4c |
497 | Precursors: 1:471f378eab4c |
489 | semi-colon: 1:471f378eab4c |
498 | semi-colon: 1:471f378eab4c |
490 | @ 471f378eab4c |
499 | @ 471f378eab4c |
491 |/ Successors: 3:eb5a0daa2192 |
500 |/ Successors: 3:eb5a0daa2192 |
492 | semi-colon: 3:eb5a0daa2192 |
501 | semi-colon: 3:eb5a0daa2192 |
493 | Fate: rewritten using fold as 3:eb5a0daa2192 |
502 | Fate: rewritten as eb5a0daa2192 |
494 | |
503 | |
495 o ea207398892e |
504 o ea207398892e |
496 |
505 |
497 $ hg fatelog |
506 $ hg fatelog |
498 o eb5a0daa2192 |
507 o eb5a0daa2192 |
499 | |
508 | |
500 | @ 471f378eab4c |
509 | @ 471f378eab4c |
501 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
510 |/ Obsfate: rewritten as eb5a0daa2192 |
502 | |
511 | |
503 o ea207398892e |
512 o ea207398892e |
504 |
513 |
505 $ hg up 'desc(B0)' --hidden |
514 $ hg up 'desc(B0)' --hidden |
506 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
515 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
514 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
523 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
515 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
524 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
516 | @ 0dec01379d3b |
525 | @ 0dec01379d3b |
517 | | Successors: 3:eb5a0daa2192 |
526 | | Successors: 3:eb5a0daa2192 |
518 | | semi-colon: 3:eb5a0daa2192 |
527 | | semi-colon: 3:eb5a0daa2192 |
519 | | Fate: rewritten using fold as 3:eb5a0daa2192 |
528 | | Fate: rewritten as eb5a0daa2192 |
520 | | |
529 | | |
521 | x 471f378eab4c |
530 | x 471f378eab4c |
522 |/ Successors: 3:eb5a0daa2192 |
531 |/ Successors: 3:eb5a0daa2192 |
523 | semi-colon: 3:eb5a0daa2192 |
532 | semi-colon: 3:eb5a0daa2192 |
524 | Fate: rewritten using fold as 3:eb5a0daa2192 |
533 | Fate: rewritten as eb5a0daa2192 |
525 | |
534 | |
526 o ea207398892e |
535 o ea207398892e |
527 |
536 |
528 $ hg fatelog |
537 $ hg fatelog |
529 o eb5a0daa2192 |
538 o eb5a0daa2192 |
530 | |
539 | |
531 | @ 0dec01379d3b |
540 | @ 0dec01379d3b |
532 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 |
541 | | Obsfate: rewritten as eb5a0daa2192 |
533 | | |
542 | | |
534 | x 471f378eab4c |
543 | x 471f378eab4c |
535 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
544 |/ Obsfate: rewritten as eb5a0daa2192 |
536 | |
545 | |
537 o ea207398892e |
546 o ea207398892e |
538 |
547 |
539 |
548 |
540 $ hg up 'desc(C0)' |
549 $ hg up 'desc(C0)' |
554 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
563 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
555 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
564 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
556 | x 0dec01379d3b |
565 | x 0dec01379d3b |
557 | | Successors: 3:eb5a0daa2192 |
566 | | Successors: 3:eb5a0daa2192 |
558 | | semi-colon: 3:eb5a0daa2192 |
567 | | semi-colon: 3:eb5a0daa2192 |
559 | | Fate: rewritten using fold as 3:eb5a0daa2192 |
568 | | Fate: rewritten as eb5a0daa2192 |
560 | | |
569 | | |
561 | x 471f378eab4c |
570 | x 471f378eab4c |
562 |/ Successors: 3:eb5a0daa2192 |
571 |/ Successors: 3:eb5a0daa2192 |
563 | semi-colon: 3:eb5a0daa2192 |
572 | semi-colon: 3:eb5a0daa2192 |
564 | Fate: rewritten using fold as 3:eb5a0daa2192 |
573 | Fate: rewritten as eb5a0daa2192 |
565 | |
574 | |
566 o ea207398892e |
575 o ea207398892e |
567 |
576 |
568 $ hg fatelog --hidden |
577 $ hg fatelog --hidden |
569 @ eb5a0daa2192 |
578 @ eb5a0daa2192 |
570 | |
579 | |
571 | x 0dec01379d3b |
580 | x 0dec01379d3b |
572 | | Obsfate: rewritten using fold as 3:eb5a0daa2192 |
581 | | Obsfate: rewritten as eb5a0daa2192 |
573 | | |
582 | | |
574 | x 471f378eab4c |
583 | x 471f378eab4c |
575 |/ Obsfate: rewritten using fold as 3:eb5a0daa2192 |
584 |/ Obsfate: rewritten as eb5a0daa2192 |
576 | |
585 | |
577 o ea207398892e |
586 o ea207398892e |
578 |
587 |
579 |
588 |
580 $ hg fatelogjson --hidden |
589 $ hg fatelogjson --hidden |
581 @ eb5a0daa2192 [] |
590 @ eb5a0daa2192 [] |
582 | |
591 | |
583 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
592 | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
584 | | |
593 | | |
585 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
594 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
586 |/ |
595 |/ |
587 o ea207398892e [] |
596 o ea207398892e [] |
588 |
597 |
589 |
598 |
590 Test templates with divergence |
599 Test templates with divergence |
607 | summary: A1 |
616 | summary: A1 |
608 | |
617 | |
609 | x changeset: 1:471f378eab4c |
618 | x changeset: 1:471f378eab4c |
610 |/ user: test |
619 |/ user: test |
611 | date: Thu Jan 01 00:00:00 1970 +0000 |
620 | date: Thu Jan 01 00:00:00 1970 +0000 |
612 | obsolete: reworded using amend as 2:fdf9bde5129a |
621 | obsolete: reworded as fdf9bde5129a |
613 | summary: A0 |
622 | summary: A0 |
614 | |
623 | |
615 o changeset: 0:ea207398892e |
624 o changeset: 0:ea207398892e |
616 user: test |
625 user: test |
617 date: Thu Jan 01 00:00:00 1970 +0000 |
626 date: Thu Jan 01 00:00:00 1970 +0000 |
620 $ hg update --hidden 'desc(A0)' |
629 $ hg update --hidden 'desc(A0)' |
621 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
630 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
622 working directory parent is obsolete! (471f378eab4c) |
631 working directory parent is obsolete! (471f378eab4c) |
623 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
632 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
624 $ hg amend -m "A2" |
633 $ hg amend -m "A2" |
625 2 new content-divergent changesets |
634 2 new divergent changesets |
626 $ hg log --hidden -G |
635 $ hg log --hidden -G |
627 @ changeset: 3:65b757b745b9 |
636 @ changeset: 3:65b757b745b9 |
628 | tag: tip |
637 | tag: tip |
629 | parent: 0:ea207398892e |
638 | parent: 0:ea207398892e |
630 | user: test |
639 | user: test |
631 | date: Thu Jan 01 00:00:00 1970 +0000 |
640 | date: Thu Jan 01 00:00:00 1970 +0000 |
632 | instability: content-divergent |
641 | trouble: divergent |
633 | summary: A2 |
642 | summary: A2 |
634 | |
643 | |
635 | o changeset: 2:fdf9bde5129a |
644 | o changeset: 2:fdf9bde5129a |
636 |/ parent: 0:ea207398892e |
645 |/ parent: 0:ea207398892e |
637 | user: test |
646 | user: test |
638 | date: Thu Jan 01 00:00:00 1970 +0000 |
647 | date: Thu Jan 01 00:00:00 1970 +0000 |
639 | instability: content-divergent |
648 | trouble: divergent |
640 | summary: A1 |
649 | summary: A1 |
641 | |
650 | |
642 | x changeset: 1:471f378eab4c |
651 | x changeset: 1:471f378eab4c |
643 |/ user: test |
652 |/ user: test |
644 | date: Thu Jan 01 00:00:00 1970 +0000 |
653 | date: Thu Jan 01 00:00:00 1970 +0000 |
645 | obsolete: reworded using amend as 2:fdf9bde5129a |
654 | obsolete: reworded as fdf9bde5129a |
646 | obsolete: reworded using amend as 3:65b757b745b9 |
655 | obsolete: reworded as 65b757b745b9 |
647 | summary: A0 |
656 | summary: A0 |
648 | |
657 | |
649 o changeset: 0:ea207398892e |
658 o changeset: 0:ea207398892e |
650 user: test |
659 user: test |
651 date: Thu Jan 01 00:00:00 1970 +0000 |
660 date: Thu Jan 01 00:00:00 1970 +0000 |
670 |/ Precursors: 1:471f378eab4c |
679 |/ Precursors: 1:471f378eab4c |
671 | semi-colon: 1:471f378eab4c |
680 | semi-colon: 1:471f378eab4c |
672 | @ 471f378eab4c |
681 | @ 471f378eab4c |
673 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
682 |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 |
674 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
683 | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 |
675 | Fate: reworded using amend as 2:fdf9bde5129a |
684 | Fate: reworded as fdf9bde5129a |
676 | Fate: reworded using amend as 4:019fadeab383 |
685 | Fate: reworded as 019fadeab383 |
677 | |
686 | |
678 o ea207398892e |
687 o ea207398892e |
679 |
688 |
680 $ hg fatelog |
689 $ hg fatelog |
681 o 019fadeab383 |
690 o 019fadeab383 |
682 | |
691 | |
683 | o fdf9bde5129a |
692 | o fdf9bde5129a |
684 |/ |
693 |/ |
685 | @ 471f378eab4c |
694 | @ 471f378eab4c |
686 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 |
695 |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383 |
687 | |
696 | |
688 o ea207398892e |
697 o ea207398892e |
689 |
698 |
690 |
699 |
691 $ hg up 'desc(A1)' |
700 $ hg up 'desc(A1)' |
715 | x 65b757b745b9 |
724 | x 65b757b745b9 |
716 |/ Precursors: 1:471f378eab4c |
725 |/ Precursors: 1:471f378eab4c |
717 | semi-colon: 1:471f378eab4c |
726 | semi-colon: 1:471f378eab4c |
718 | Successors: 4:019fadeab383 |
727 | Successors: 4:019fadeab383 |
719 | semi-colon: 4:019fadeab383 |
728 | semi-colon: 4:019fadeab383 |
720 | Fate: reworded using amend as 4:019fadeab383 |
729 | Fate: reworded as 019fadeab383 |
721 | |
730 | |
722 | @ fdf9bde5129a |
731 | @ fdf9bde5129a |
723 |/ Precursors: 1:471f378eab4c |
732 |/ Precursors: 1:471f378eab4c |
724 | semi-colon: 1:471f378eab4c |
733 | semi-colon: 1:471f378eab4c |
725 | x 471f378eab4c |
734 | x 471f378eab4c |
726 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
735 |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 |
727 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
736 | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 |
728 | Fate: reworded using amend as 2:fdf9bde5129a |
737 | Fate: reworded as fdf9bde5129a |
729 | Fate: reworded using amend as 3:65b757b745b9 |
738 | Fate: reworded as 65b757b745b9 |
730 | |
739 | |
731 o ea207398892e |
740 o ea207398892e |
732 |
741 |
733 $ hg fatelog --hidden |
742 $ hg fatelog --hidden |
734 o 019fadeab383 |
743 o 019fadeab383 |
735 | |
744 | |
736 | x 65b757b745b9 |
745 | x 65b757b745b9 |
737 |/ Obsfate: reworded using amend as 4:019fadeab383 |
746 |/ Obsfate: reworded as 019fadeab383 |
738 | |
747 | |
739 | @ fdf9bde5129a |
748 | @ fdf9bde5129a |
740 |/ |
749 |/ |
741 | x 471f378eab4c |
750 | x 471f378eab4c |
742 |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9 |
751 |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9 |
743 | |
752 | |
744 o ea207398892e |
753 o ea207398892e |
745 |
754 |
746 |
755 |
747 $ hg fatelogjson --hidden |
756 $ hg fatelogjson --hidden |
748 o 019fadeab383 [] |
757 o 019fadeab383 [] |
749 | |
758 | |
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"}] |
759 | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] |
751 |/ |
760 |/ |
752 | @ fdf9bde5129a [] |
761 | @ fdf9bde5129a [] |
753 |/ |
762 |/ |
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"}] |
763 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["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"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] |
755 |/ |
764 |/ |
756 o ea207398892e [] |
765 o ea207398892e [] |
757 |
766 |
758 |
767 |
759 Test templates with amended + folded commit |
768 Test templates with amended + folded commit |
777 | summary: B1 |
786 | summary: B1 |
778 | |
787 | |
779 | x changeset: 2:0dec01379d3b |
788 | x changeset: 2:0dec01379d3b |
780 |/ user: test |
789 |/ user: test |
781 | date: Thu Jan 01 00:00:00 1970 +0000 |
790 | date: Thu Jan 01 00:00:00 1970 +0000 |
782 | obsolete: reworded using amend as 3:b7ea6d14e664 |
791 | obsolete: reworded as b7ea6d14e664 |
783 | summary: B0 |
792 | summary: B0 |
784 | |
793 | |
785 o changeset: 1:471f378eab4c |
794 o changeset: 1:471f378eab4c |
786 | user: test |
795 | user: test |
787 | date: Thu Jan 01 00:00:00 1970 +0000 |
796 | date: Thu Jan 01 00:00:00 1970 +0000 |
805 | |
814 | |
806 | x changeset: 3:b7ea6d14e664 |
815 | x changeset: 3:b7ea6d14e664 |
807 | | parent: 1:471f378eab4c |
816 | | parent: 1:471f378eab4c |
808 | | user: test |
817 | | user: test |
809 | | date: Thu Jan 01 00:00:00 1970 +0000 |
818 | | date: Thu Jan 01 00:00:00 1970 +0000 |
810 | | obsolete: rewritten using fold as 4:eb5a0daa2192 |
819 | | obsolete: rewritten as eb5a0daa2192 |
811 | | summary: B1 |
820 | | summary: B1 |
812 | | |
821 | | |
813 | | x changeset: 2:0dec01379d3b |
822 | | x changeset: 2:0dec01379d3b |
814 | |/ user: test |
823 | |/ user: test |
815 | | date: Thu Jan 01 00:00:00 1970 +0000 |
824 | | date: Thu Jan 01 00:00:00 1970 +0000 |
816 | | obsolete: reworded using amend as 3:b7ea6d14e664 |
825 | | obsolete: reworded as b7ea6d14e664 |
817 | | summary: B0 |
826 | | summary: B0 |
818 | | |
827 | | |
819 | x changeset: 1:471f378eab4c |
828 | x changeset: 1:471f378eab4c |
820 |/ user: test |
829 |/ user: test |
821 | date: Thu Jan 01 00:00:00 1970 +0000 |
830 | date: Thu Jan 01 00:00:00 1970 +0000 |
822 | obsolete: rewritten using fold as 4:eb5a0daa2192 |
831 | obsolete: rewritten as eb5a0daa2192 |
823 | summary: A0 |
832 | summary: A0 |
824 | |
833 | |
825 o changeset: 0:ea207398892e |
834 o changeset: 0:ea207398892e |
826 user: test |
835 user: test |
827 date: Thu Jan 01 00:00:00 1970 +0000 |
836 date: Thu Jan 01 00:00:00 1970 +0000 |
839 | Precursors: 1:471f378eab4c |
848 | Precursors: 1:471f378eab4c |
840 | semi-colon: 1:471f378eab4c |
849 | semi-colon: 1:471f378eab4c |
841 | @ 471f378eab4c |
850 | @ 471f378eab4c |
842 |/ Successors: 4:eb5a0daa2192 |
851 |/ Successors: 4:eb5a0daa2192 |
843 | semi-colon: 4:eb5a0daa2192 |
852 | semi-colon: 4:eb5a0daa2192 |
844 | Fate: rewritten using fold as 4:eb5a0daa2192 |
853 | Fate: rewritten as eb5a0daa2192 |
845 | |
854 | |
846 o ea207398892e |
855 o ea207398892e |
847 |
856 |
848 $ hg fatelog |
857 $ hg fatelog |
849 o eb5a0daa2192 |
858 o eb5a0daa2192 |
850 | |
859 | |
851 | @ 471f378eab4c |
860 | @ 471f378eab4c |
852 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
861 |/ Obsfate: rewritten as eb5a0daa2192 |
853 | |
862 | |
854 o ea207398892e |
863 o ea207398892e |
855 |
864 |
856 $ hg up 'desc(B0)' --hidden |
865 $ hg up 'desc(B0)' --hidden |
857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
866 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
862 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
871 | Precursors: 2:0dec01379d3b 1:471f378eab4c |
863 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
872 | semi-colon: 2:0dec01379d3b; 1:471f378eab4c |
864 | @ 0dec01379d3b |
873 | @ 0dec01379d3b |
865 | | Successors: 4:eb5a0daa2192 |
874 | | Successors: 4:eb5a0daa2192 |
866 | | semi-colon: 4:eb5a0daa2192 |
875 | | semi-colon: 4:eb5a0daa2192 |
867 | | Fate: rewritten using amend, fold as 4:eb5a0daa2192 |
876 | | Fate: rewritten as eb5a0daa2192 |
868 | | |
877 | | |
869 | x 471f378eab4c |
878 | x 471f378eab4c |
870 |/ Successors: 4:eb5a0daa2192 |
879 |/ Successors: 4:eb5a0daa2192 |
871 | semi-colon: 4:eb5a0daa2192 |
880 | semi-colon: 4:eb5a0daa2192 |
872 | Fate: rewritten using fold as 4:eb5a0daa2192 |
881 | Fate: rewritten as eb5a0daa2192 |
873 | |
882 | |
874 o ea207398892e |
883 o ea207398892e |
875 |
884 |
876 $ hg fatelog |
885 $ hg fatelog |
877 o eb5a0daa2192 |
886 o eb5a0daa2192 |
878 | |
887 | |
879 | @ 0dec01379d3b |
888 | @ 0dec01379d3b |
880 | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192 |
889 | | Obsfate: rewritten as eb5a0daa2192 |
881 | | |
890 | | |
882 | x 471f378eab4c |
891 | x 471f378eab4c |
883 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
892 |/ Obsfate: rewritten as eb5a0daa2192 |
884 | |
893 | |
885 o ea207398892e |
894 o ea207398892e |
886 |
895 |
887 |
896 |
888 $ hg up 'desc(B1)' --hidden |
897 $ hg up 'desc(B1)' --hidden |
894 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 |
903 | Precursors: 1:471f378eab4c 3:b7ea6d14e664 |
895 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
904 | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 |
896 | @ b7ea6d14e664 |
905 | @ b7ea6d14e664 |
897 | | Successors: 4:eb5a0daa2192 |
906 | | Successors: 4:eb5a0daa2192 |
898 | | semi-colon: 4:eb5a0daa2192 |
907 | | semi-colon: 4:eb5a0daa2192 |
899 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
908 | | Fate: rewritten as eb5a0daa2192 |
900 | | |
909 | | |
901 | x 471f378eab4c |
910 | x 471f378eab4c |
902 |/ Successors: 4:eb5a0daa2192 |
911 |/ Successors: 4:eb5a0daa2192 |
903 | semi-colon: 4:eb5a0daa2192 |
912 | semi-colon: 4:eb5a0daa2192 |
904 | Fate: rewritten using fold as 4:eb5a0daa2192 |
913 | Fate: rewritten as eb5a0daa2192 |
905 | |
914 | |
906 o ea207398892e |
915 o ea207398892e |
907 |
916 |
908 $ hg fatelog |
917 $ hg fatelog |
909 o eb5a0daa2192 |
918 o eb5a0daa2192 |
910 | |
919 | |
911 | @ b7ea6d14e664 |
920 | @ b7ea6d14e664 |
912 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 |
921 | | Obsfate: rewritten as eb5a0daa2192 |
913 | | |
922 | | |
914 | x 471f378eab4c |
923 | x 471f378eab4c |
915 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
924 |/ Obsfate: rewritten as eb5a0daa2192 |
916 | |
925 | |
917 o ea207398892e |
926 o ea207398892e |
918 |
927 |
919 |
928 |
920 $ hg up 'desc(C0)' |
929 $ hg up 'desc(C0)' |
931 | x b7ea6d14e664 |
940 | x b7ea6d14e664 |
932 | | Precursors: 2:0dec01379d3b |
941 | | Precursors: 2:0dec01379d3b |
933 | | semi-colon: 2:0dec01379d3b |
942 | | semi-colon: 2:0dec01379d3b |
934 | | Successors: 4:eb5a0daa2192 |
943 | | Successors: 4:eb5a0daa2192 |
935 | | semi-colon: 4:eb5a0daa2192 |
944 | | semi-colon: 4:eb5a0daa2192 |
936 | | Fate: rewritten using fold as 4:eb5a0daa2192 |
945 | | Fate: rewritten as eb5a0daa2192 |
937 | | |
946 | | |
938 | | x 0dec01379d3b |
947 | | x 0dec01379d3b |
939 | |/ Successors: 3:b7ea6d14e664 |
948 | |/ Successors: 3:b7ea6d14e664 |
940 | | semi-colon: 3:b7ea6d14e664 |
949 | | semi-colon: 3:b7ea6d14e664 |
941 | | Fate: reworded using amend as 3:b7ea6d14e664 |
950 | | Fate: reworded as b7ea6d14e664 |
942 | | |
951 | | |
943 | x 471f378eab4c |
952 | x 471f378eab4c |
944 |/ Successors: 4:eb5a0daa2192 |
953 |/ Successors: 4:eb5a0daa2192 |
945 | semi-colon: 4:eb5a0daa2192 |
954 | semi-colon: 4:eb5a0daa2192 |
946 | Fate: rewritten using fold as 4:eb5a0daa2192 |
955 | Fate: rewritten as eb5a0daa2192 |
947 | |
956 | |
948 o ea207398892e |
957 o ea207398892e |
949 |
958 |
950 $ hg fatelog --hidden |
959 $ hg fatelog --hidden |
951 @ eb5a0daa2192 |
960 @ eb5a0daa2192 |
952 | |
961 | |
953 | x b7ea6d14e664 |
962 | x b7ea6d14e664 |
954 | | Obsfate: rewritten using fold as 4:eb5a0daa2192 |
963 | | Obsfate: rewritten as eb5a0daa2192 |
955 | | |
964 | | |
956 | | x 0dec01379d3b |
965 | | x 0dec01379d3b |
957 | |/ Obsfate: reworded using amend as 3:b7ea6d14e664 |
966 | |/ Obsfate: reworded as b7ea6d14e664 |
958 | | |
967 | | |
959 | x 471f378eab4c |
968 | x 471f378eab4c |
960 |/ Obsfate: rewritten using fold as 4:eb5a0daa2192 |
969 |/ Obsfate: rewritten as eb5a0daa2192 |
961 | |
970 | |
962 o ea207398892e |
971 o ea207398892e |
963 |
972 |
964 $ hg fatelogjson --hidden |
973 $ hg fatelogjson --hidden |
965 @ eb5a0daa2192 [] |
974 @ eb5a0daa2192 [] |
966 | |
975 | |
967 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
976 | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
968 | | |
977 | | |
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"}] |
978 | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] |
970 | |/ |
979 | |/ |
971 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
980 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] |
972 |/ |
981 |/ |
973 o ea207398892e [] |
982 o ea207398892e [] |
974 |
983 |
975 |
984 |
976 Test template with pushed and pulled obs markers |
985 Test template with pushed and pulled obs markers |
1012 | |
1021 | |
1013 | x changeset: 2:fdf9bde5129a |
1022 | x changeset: 2:fdf9bde5129a |
1014 |/ parent: 0:ea207398892e |
1023 |/ parent: 0:ea207398892e |
1015 | user: test |
1024 | user: test |
1016 | date: Thu Jan 01 00:00:00 1970 +0000 |
1025 | date: Thu Jan 01 00:00:00 1970 +0000 |
1017 | obsolete: reworded using amend as 3:7a230b46bf61 |
1026 | obsolete: reworded as 7a230b46bf61 |
1018 | summary: A1 |
1027 | summary: A1 |
1019 | |
1028 | |
1020 | x changeset: 1:471f378eab4c |
1029 | x changeset: 1:471f378eab4c |
1021 |/ user: test |
1030 |/ user: test |
1022 | date: Thu Jan 01 00:00:00 1970 +0000 |
1031 | date: Thu Jan 01 00:00:00 1970 +0000 |
1023 | obsolete: reworded using amend as 2:fdf9bde5129a |
1032 | obsolete: reworded as fdf9bde5129a |
1024 | summary: A0 |
1033 | summary: A0 |
1025 | |
1034 | |
1026 o changeset: 0:ea207398892e |
1035 o changeset: 0:ea207398892e |
1027 user: test |
1036 user: test |
1028 date: Thu Jan 01 00:00:00 1970 +0000 |
1037 date: Thu Jan 01 00:00:00 1970 +0000 |
1036 adding manifests |
1045 adding manifests |
1037 adding file changes |
1046 adding file changes |
1038 added 1 changesets with 0 changes to 1 files (+1 heads) |
1047 added 1 changesets with 0 changes to 1 files (+1 heads) |
1039 2 new obsolescence markers |
1048 2 new obsolescence markers |
1040 obsoleted 1 changesets |
1049 obsoleted 1 changesets |
1041 new changesets 7a230b46bf61 |
|
1042 (run 'hg heads' to see heads, 'hg merge' to merge) |
1050 (run 'hg heads' to see heads, 'hg merge' to merge) |
1043 working directory parent is obsolete! (471f378eab4c) |
1051 working directory parent is obsolete! (471f378eab4c) |
1044 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1052 (use 'hg evolve' to update to its successor: 7a230b46bf61) |
1045 $ hg log --hidden -G |
1053 $ hg log --hidden -G |
1046 o changeset: 2:7a230b46bf61 |
1054 o changeset: 2:7a230b46bf61 |
1051 | summary: A2 |
1059 | summary: A2 |
1052 | |
1060 | |
1053 | @ changeset: 1:471f378eab4c |
1061 | @ changeset: 1:471f378eab4c |
1054 |/ user: test |
1062 |/ user: test |
1055 | date: Thu Jan 01 00:00:00 1970 +0000 |
1063 | date: Thu Jan 01 00:00:00 1970 +0000 |
1056 | obsolete: reworded using amend as 2:7a230b46bf61 |
1064 | obsolete: reworded as 7a230b46bf61 |
1057 | summary: A0 |
1065 | summary: A0 |
1058 | |
1066 | |
1059 o changeset: 0:ea207398892e |
1067 o changeset: 0:ea207398892e |
1060 user: test |
1068 user: test |
1061 date: Thu Jan 01 00:00:00 1970 +0000 |
1069 date: Thu Jan 01 00:00:00 1970 +0000 |
1069 | Precursors: 1:471f378eab4c |
1077 | Precursors: 1:471f378eab4c |
1070 | semi-colon: 1:471f378eab4c |
1078 | semi-colon: 1:471f378eab4c |
1071 | @ 471f378eab4c |
1079 | @ 471f378eab4c |
1072 |/ Successors: 2:7a230b46bf61 |
1080 |/ Successors: 2:7a230b46bf61 |
1073 | semi-colon: 2:7a230b46bf61 |
1081 | semi-colon: 2:7a230b46bf61 |
1074 | Fate: reworded using amend as 2:7a230b46bf61 |
1082 | Fate: reworded as 7a230b46bf61 |
1075 | |
1083 | |
1076 o ea207398892e |
1084 o ea207398892e |
1077 |
1085 |
1078 $ hg fatelog --hidden -v |
1086 $ hg fatelog --hidden -v |
1079 o 7a230b46bf61 |
1087 o 7a230b46bf61 |
1080 | |
1088 | |
1081 | @ 471f378eab4c |
1089 | @ 471f378eab4c |
1082 |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1090 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1083 | |
1091 | |
1084 o ea207398892e |
1092 o ea207398892e |
1085 |
1093 |
1086 $ hg up 'desc(A2)' |
1094 $ hg up 'desc(A2)' |
1087 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1095 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1100 | Precursors: 1:471f378eab4c |
1108 | Precursors: 1:471f378eab4c |
1101 | semi-colon: 1:471f378eab4c |
1109 | semi-colon: 1:471f378eab4c |
1102 | x 471f378eab4c |
1110 | x 471f378eab4c |
1103 |/ Successors: 2:7a230b46bf61 |
1111 |/ Successors: 2:7a230b46bf61 |
1104 | semi-colon: 2:7a230b46bf61 |
1112 | semi-colon: 2:7a230b46bf61 |
1105 | Fate: reworded using amend as 2:7a230b46bf61 |
1113 | Fate: reworded as 7a230b46bf61 |
1106 | |
1114 | |
1107 o ea207398892e |
1115 o ea207398892e |
1108 |
1116 |
1109 $ hg fatelog --hidden -v |
1117 $ hg fatelog --hidden -v |
1110 @ 7a230b46bf61 |
1118 @ 7a230b46bf61 |
1111 | |
1119 | |
1112 | x 471f378eab4c |
1120 | x 471f378eab4c |
1113 |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1121 |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) |
1114 | |
1122 | |
1115 o ea207398892e |
1123 o ea207398892e |
1116 |
1124 |
1117 |
1125 |
1118 $ hg fatelogjson --hidden |
1126 $ hg fatelogjson --hidden |
1119 @ 7a230b46bf61 [] |
1127 @ 7a230b46bf61 [] |
1120 | |
1128 | |
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"}] |
1129 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] |
1122 |/ |
1130 |/ |
1123 o ea207398892e [] |
1131 o ea207398892e [] |
1124 |
1132 |
1125 |
1133 |
1126 Test template with obsmarkers cycle |
1134 Test template with obsmarkers cycle |
1171 | @ 0dec01379d3b |
1179 | @ 0dec01379d3b |
1172 | | Precursors: 1:471f378eab4c |
1180 | | Precursors: 1:471f378eab4c |
1173 | | semi-colon: 1:471f378eab4c |
1181 | | semi-colon: 1:471f378eab4c |
1174 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1182 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1175 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1183 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1176 | | Fate: rewritten as 3:f897c6137566 |
1184 | | Fate: rewritten as f897c6137566 |
1177 | | Fate: rewritten as 1:471f378eab4c |
1185 | | Fate: rewritten as 471f378eab4c |
1178 | | |
1186 | | |
1179 | x 471f378eab4c |
1187 | x 471f378eab4c |
1180 |/ Precursors: 2:0dec01379d3b |
1188 |/ Precursors: 2:0dec01379d3b |
1181 | semi-colon: 2:0dec01379d3b |
1189 | semi-colon: 2:0dec01379d3b |
1182 | Successors: 2:0dec01379d3b |
1190 | Successors: 2:0dec01379d3b |
1183 | semi-colon: 2:0dec01379d3b |
1191 | semi-colon: 2:0dec01379d3b |
1184 | Fate: rewritten as 2:0dec01379d3b |
1192 | Fate: rewritten as 0dec01379d3b |
1185 | |
1193 | |
1186 o ea207398892e |
1194 o ea207398892e |
1187 |
1195 |
1188 $ hg fatelog |
1196 $ hg fatelog |
1189 o f897c6137566 |
1197 o f897c6137566 |
1190 | |
1198 | |
1191 | @ 0dec01379d3b |
1199 | @ 0dec01379d3b |
1192 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
1200 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
1193 | | |
1201 | | |
1194 | x 471f378eab4c |
1202 | x 471f378eab4c |
1195 |/ Obsfate: rewritten as 2:0dec01379d3b |
1203 |/ Obsfate: rewritten as 0dec01379d3b |
1196 | |
1204 | |
1197 o ea207398892e |
1205 o ea207398892e |
1198 |
1206 |
1199 $ hg up -r "desc(A0)" --hidden |
1207 $ hg up -r "desc(A0)" --hidden |
1200 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1208 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1237 | x 0dec01379d3b |
1245 | x 0dec01379d3b |
1238 | | Precursors: 1:471f378eab4c |
1246 | | Precursors: 1:471f378eab4c |
1239 | | semi-colon: 1:471f378eab4c |
1247 | | semi-colon: 1:471f378eab4c |
1240 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1248 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1241 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1249 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1242 | | Fate: rewritten as 3:f897c6137566 |
1250 | | Fate: rewritten as f897c6137566 |
1243 | | Fate: rewritten as 1:471f378eab4c |
1251 | | Fate: rewritten as 471f378eab4c |
1244 | | |
1252 | | |
1245 | x 471f378eab4c |
1253 | x 471f378eab4c |
1246 |/ Precursors: 2:0dec01379d3b |
1254 |/ Precursors: 2:0dec01379d3b |
1247 | semi-colon: 2:0dec01379d3b |
1255 | semi-colon: 2:0dec01379d3b |
1248 | Successors: 2:0dec01379d3b |
1256 | Successors: 2:0dec01379d3b |
1249 | semi-colon: 2:0dec01379d3b |
1257 | semi-colon: 2:0dec01379d3b |
1250 | Fate: rewritten as 2:0dec01379d3b |
1258 | Fate: rewritten as 0dec01379d3b |
1251 | |
1259 | |
1252 @ ea207398892e |
1260 @ ea207398892e |
1253 |
1261 |
1254 Test template with split + divergence with cycles |
1262 Test template with split + divergence with cycles |
1255 ================================================= |
1263 ================================================= |
1355 Diverge one of the splitted commit |
1363 Diverge one of the splitted commit |
1356 |
1364 |
1357 $ hg up 6 |
1365 $ hg up 6 |
1358 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1366 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1359 $ hg commit --amend -m "Add only B" |
1367 $ hg commit --amend -m "Add only B" |
1360 1 new orphan changesets |
1368 1 new unstable changesets |
1361 |
1369 |
1362 $ hg up 6 --hidden |
1370 $ hg up 6 --hidden |
1363 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1371 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1364 working directory parent is obsolete! (4a004186e638) |
1372 working directory parent is obsolete! (4a004186e638) |
1365 (use 'hg evolve' to update to its successor: b18bc8331526) |
1373 (use 'hg evolve' to update to its successor: b18bc8331526) |
1366 $ hg commit --amend -m "Add B only" |
1374 $ hg commit --amend -m "Add B only" |
1367 4 new content-divergent changesets |
1375 4 new divergent changesets |
1368 |
1376 |
1369 $ hg log -G |
1377 $ hg log -G |
1370 @ changeset: 9:0b997eb7ceee |
1378 @ changeset: 9:0b997eb7ceee |
1371 | tag: tip |
1379 | tag: tip |
1372 | parent: 5:dd800401bd8c |
1380 | parent: 5:dd800401bd8c |
1373 | user: test |
1381 | user: test |
1374 | date: Thu Jan 01 00:00:00 1970 +0000 |
1382 | date: Thu Jan 01 00:00:00 1970 +0000 |
1375 | instability: content-divergent |
1383 | trouble: divergent |
1376 | summary: Add B only |
1384 | summary: Add B only |
1377 | |
1385 | |
1378 | o changeset: 8:b18bc8331526 |
1386 | o changeset: 8:b18bc8331526 |
1379 |/ parent: 5:dd800401bd8c |
1387 |/ parent: 5:dd800401bd8c |
1380 | user: test |
1388 | user: test |
1381 | date: Thu Jan 01 00:00:00 1970 +0000 |
1389 | date: Thu Jan 01 00:00:00 1970 +0000 |
1382 | instability: content-divergent |
1390 | trouble: divergent |
1383 | summary: Add only B |
1391 | summary: Add only B |
1384 | |
1392 | |
1385 | o changeset: 7:ba2ed02b0c9a |
1393 | o changeset: 7:ba2ed02b0c9a |
1386 | | user: test |
1394 | | user: test |
1387 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1395 | | date: Thu Jan 01 00:00:00 1970 +0000 |
1388 | | instability: orphan, content-divergent |
1396 | | trouble: unstable, divergent |
1389 | | summary: Add A,B,C |
1397 | | summary: Add A,B,C |
1390 | | |
1398 | | |
1391 | x changeset: 6:4a004186e638 |
1399 | x changeset: 6:4a004186e638 |
1392 |/ user: test |
1400 |/ user: test |
1393 | date: Thu Jan 01 00:00:00 1970 +0000 |
1401 | date: Thu Jan 01 00:00:00 1970 +0000 |
1394 | obsolete: reworded using amend as 8:b18bc8331526 |
1402 | obsolete: reworded as b18bc8331526 |
1395 | obsolete: reworded using amend as 9:0b997eb7ceee |
1403 | obsolete: reworded as 0b997eb7ceee |
1396 | summary: Add A,B,C |
1404 | summary: Add A,B,C |
1397 | |
1405 | |
1398 o changeset: 5:dd800401bd8c |
1406 o changeset: 5:dd800401bd8c |
1399 | parent: 3:f897c6137566 |
1407 | parent: 3:f897c6137566 |
1400 | user: test |
1408 | user: test |
1401 | date: Thu Jan 01 00:00:00 1970 +0000 |
1409 | date: Thu Jan 01 00:00:00 1970 +0000 |
1402 | instability: content-divergent |
1410 | trouble: divergent |
1403 | summary: Add A,B,C |
1411 | summary: Add A,B,C |
1404 | |
1412 | |
1405 o changeset: 3:f897c6137566 |
1413 o changeset: 3:f897c6137566 |
1406 | parent: 0:ea207398892e |
1414 | parent: 0:ea207398892e |
1407 | user: test |
1415 | user: test |
1426 | o ba2ed02b0c9a |
1434 | o ba2ed02b0c9a |
1427 | | |
1435 | | |
1428 | x 4a004186e638 |
1436 | x 4a004186e638 |
1429 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1437 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1430 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1438 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1431 | Fate: reworded using amend as 8:b18bc8331526 |
1439 | Fate: reworded as b18bc8331526 |
1432 | Fate: reworded using amend as 9:0b997eb7ceee |
1440 | Fate: reworded as 0b997eb7ceee |
1433 | |
1441 | |
1434 o dd800401bd8c |
1442 o dd800401bd8c |
1435 | |
1443 | |
1436 o f897c6137566 |
1444 o f897c6137566 |
1437 | |
1445 | |
1443 | o b18bc8331526 |
1451 | o b18bc8331526 |
1444 |/ |
1452 |/ |
1445 | o ba2ed02b0c9a |
1453 | o ba2ed02b0c9a |
1446 | | |
1454 | | |
1447 | x 4a004186e638 |
1455 | x 4a004186e638 |
1448 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee |
1456 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
1449 | |
1457 | |
1450 o dd800401bd8c |
1458 o dd800401bd8c |
1451 | |
1459 | |
1452 o f897c6137566 |
1460 o f897c6137566 |
1453 | |
1461 | |
1466 | x 4a004186e638 |
1474 | x 4a004186e638 |
1467 |/ Precursors: 4:9bd10a0775e4 |
1475 |/ Precursors: 4:9bd10a0775e4 |
1468 | semi-colon: 4:9bd10a0775e4 |
1476 | semi-colon: 4:9bd10a0775e4 |
1469 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1477 | Successors: 8:b18bc8331526; 9:0b997eb7ceee |
1470 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1478 | semi-colon: 8:b18bc8331526; 9:0b997eb7ceee |
1471 | Fate: reworded using amend as 8:b18bc8331526 |
1479 | Fate: reworded as b18bc8331526 |
1472 | Fate: reworded using amend as 9:0b997eb7ceee |
1480 | Fate: reworded as 0b997eb7ceee |
1473 | |
1481 | |
1474 o dd800401bd8c |
1482 o dd800401bd8c |
1475 | Precursors: 4:9bd10a0775e4 |
1483 | Precursors: 4:9bd10a0775e4 |
1476 | semi-colon: 4:9bd10a0775e4 |
1484 | semi-colon: 4:9bd10a0775e4 |
1477 | x 9bd10a0775e4 |
1485 | x 9bd10a0775e4 |
1478 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1486 |/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1479 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1487 | semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a |
1480 | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1488 | Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
1481 | |
1489 | |
1482 o f897c6137566 |
1490 o f897c6137566 |
1483 | Precursors: 2:0dec01379d3b |
1491 | Precursors: 2:0dec01379d3b |
1484 | semi-colon: 2:0dec01379d3b |
1492 | semi-colon: 2:0dec01379d3b |
1485 | x 0dec01379d3b |
1493 | x 0dec01379d3b |
1486 | | Precursors: 1:471f378eab4c |
1494 | | Precursors: 1:471f378eab4c |
1487 | | semi-colon: 1:471f378eab4c |
1495 | | semi-colon: 1:471f378eab4c |
1488 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1496 | | Successors: 3:f897c6137566; 1:471f378eab4c |
1489 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1497 | | semi-colon: 3:f897c6137566; 1:471f378eab4c |
1490 | | Fate: rewritten as 3:f897c6137566 |
1498 | | Fate: rewritten as f897c6137566 |
1491 | | Fate: rewritten as 1:471f378eab4c |
1499 | | Fate: rewritten as 471f378eab4c |
1492 | | |
1500 | | |
1493 | x 471f378eab4c |
1501 | x 471f378eab4c |
1494 |/ Precursors: 2:0dec01379d3b |
1502 |/ Precursors: 2:0dec01379d3b |
1495 | semi-colon: 2:0dec01379d3b |
1503 | semi-colon: 2:0dec01379d3b |
1496 | Successors: 2:0dec01379d3b |
1504 | Successors: 2:0dec01379d3b |
1497 | semi-colon: 2:0dec01379d3b |
1505 | semi-colon: 2:0dec01379d3b |
1498 | Fate: rewritten as 2:0dec01379d3b |
1506 | Fate: rewritten as 0dec01379d3b |
1499 | |
1507 | |
1500 o ea207398892e |
1508 o ea207398892e |
1501 |
1509 |
1502 $ hg fatelog --hidden |
1510 $ hg fatelog --hidden |
1503 @ 0b997eb7ceee |
1511 @ 0b997eb7ceee |
1505 | o b18bc8331526 |
1513 | o b18bc8331526 |
1506 |/ |
1514 |/ |
1507 | o ba2ed02b0c9a |
1515 | o ba2ed02b0c9a |
1508 | | |
1516 | | |
1509 | x 4a004186e638 |
1517 | x 4a004186e638 |
1510 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee |
1518 |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee |
1511 | |
1519 | |
1512 o dd800401bd8c |
1520 o dd800401bd8c |
1513 | |
1521 | |
1514 | x 9bd10a0775e4 |
1522 | x 9bd10a0775e4 |
1515 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a |
1523 |/ Obsfate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c |
1516 | |
1524 | |
1517 o f897c6137566 |
1525 o f897c6137566 |
1518 | |
1526 | |
1519 | x 0dec01379d3b |
1527 | x 0dec01379d3b |
1520 | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c |
1528 | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c |
1521 | | |
1529 | | |
1522 | x 471f378eab4c |
1530 | x 471f378eab4c |
1523 |/ Obsfate: rewritten as 2:0dec01379d3b |
1531 |/ Obsfate: rewritten as 0dec01379d3b |
1524 | |
1532 | |
1525 o ea207398892e |
1533 o ea207398892e |
1526 |
1534 |
1527 $ hg up --hidden 4 |
1535 $ hg up --hidden 4 |
1528 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1536 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1544 | Precursors: 4:9bd10a0775e4 |
1552 | Precursors: 4:9bd10a0775e4 |
1545 | semi-colon: 4:9bd10a0775e4 |
1553 | semi-colon: 4:9bd10a0775e4 |
1546 | @ 9bd10a0775e4 |
1554 | @ 9bd10a0775e4 |
1547 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1555 |/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1548 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1556 | semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc |
1549 | Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc |
1557 | Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc |
1550 | Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1558 | Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
1551 | |
1559 | |
1552 o f897c6137566 |
1560 o f897c6137566 |
1553 | |
1561 | |
1554 o ea207398892e |
1562 o ea207398892e |
1555 |
1563 |
1561 o | b18bc8331526 |
1569 o | b18bc8331526 |
1562 |/ |
1570 |/ |
1563 o dd800401bd8c |
1571 o dd800401bd8c |
1564 | |
1572 | |
1565 | @ 9bd10a0775e4 |
1573 | @ 9bd10a0775e4 |
1566 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc |
1574 |/ Obsfate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc; split as b18bc8331526, dd800401bd8c, eceed8f98ffc |
1567 | |
1575 | |
1568 o f897c6137566 |
1576 o f897c6137566 |
1569 | |
1577 | |
1570 o ea207398892e |
1578 o ea207398892e |
1571 |
1579 |
1591 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1599 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1592 working directory parent is obsolete! (471f378eab4c) |
1600 working directory parent is obsolete! (471f378eab4c) |
1593 (use 'hg evolve' to update to its parent successor) |
1601 (use 'hg evolve' to update to its parent successor) |
1594 $ hg tlog |
1602 $ hg tlog |
1595 @ 471f378eab4c |
1603 @ 471f378eab4c |
1596 | Fate: pruned using prune |
1604 | Fate: pruned |
1597 | |
1605 | |
1598 o ea207398892e |
1606 o ea207398892e |
1599 |
1607 |
1600 $ hg fatelog -v |
1608 $ hg fatelog -v |
1601 @ 471f378eab4c |
1609 @ 471f378eab4c |
1602 | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000) |
1610 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) |
1603 | |
1611 | |
1604 o ea207398892e |
1612 o ea207398892e |
1605 |
1613 |