|
1 ===================== |
|
2 Evolve/Topic Training |
|
3 ===================== |
|
4 |
|
5 .. Various setup |
|
6 |
|
7 $ . $TESTDIR/testlib/common.sh |
|
8 $ cat >> $HGRCPATH << EOF |
|
9 > [ui] |
|
10 > interactive = true |
|
11 > [extensions] |
|
12 > rebase= |
|
13 > evolve= |
|
14 > topic= |
|
15 > docgraph= |
|
16 > histedit= |
|
17 > |
|
18 > EOF |
|
19 |
|
20 Create the base repo |
|
21 -------------------- |
|
22 |
|
23 $ hg init $TESTTMP/base |
|
24 $ cd $TESTTMP/base |
|
25 |
|
26 Setup the hgrc |
|
27 $ cat > .hg/hgrc << EOF |
|
28 > [paths] |
|
29 > default = https://bitbucket.org/octobus/evolve_training_repo |
|
30 > [ui] |
|
31 > interactive = true |
|
32 > interface = text |
|
33 > username = Boris Feld <boris.feld@octobus.net> |
|
34 > tweakdefault = true |
|
35 > [extensions] |
|
36 > rebase= |
|
37 > evolve= |
|
38 > topic= |
|
39 > histedit= |
|
40 > [phases] |
|
41 > publish = False |
|
42 > |
|
43 > EOF |
|
44 |
|
45 0:ROOT |
|
46 |
|
47 $ touch README |
|
48 $ cp .hg/hgrc hgrc |
|
49 $ hg add README hgrc |
|
50 $ hg commit -m "ROOT" -d "Thu Dec 07 11:26:05 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
51 $ hg phase -p . |
|
52 |
|
53 1:amend |
|
54 |
|
55 $ hg branch typo |
|
56 marked working directory as branch typo |
|
57 (branches are permanent and global, did you want a bookmark?) |
|
58 $ touch fix-bug |
|
59 $ hg add fix-bug |
|
60 $ hg commit -m "Fx bug" -d "Thu Dec 07 11:26:53 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
61 |
|
62 2-6:rebase |
|
63 $ hg up 0 |
|
64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
65 |
|
66 $ hg branch build/v2 |
|
67 marked working directory as branch build/v2 |
|
68 $ mkdir v2 |
|
69 $ touch v2/README |
|
70 $ hg add v2/README |
|
71 $ hg commit -m "First commit on build/v2" -d "Thu Dec 07 16:45:07 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
72 |
|
73 $ hg branch build/linuxsupport-v2 |
|
74 marked working directory as branch build/linuxsupport-v2 |
|
75 $ touch v2/LINUX |
|
76 $ hg add v2/LINUX |
|
77 $ hg commit -m "First commit on build/linuxsupport-v2" -d "Thu Dec 07 16:46:32 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
78 |
|
79 $ echo "Instructions for linux" > v2/LINUX |
|
80 $ hg commit -m "Second commit on build/linuxsupport-v2." -d "Mon Dec 11 11:20:24 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
81 |
|
82 $ touch v2/Makefile.linux |
|
83 $ hg add v2/Makefile.linux |
|
84 $ hg commit -m "Third commit on build/linuxsupport-v2" -d "Mon Dec 11 11:21:02 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
85 |
|
86 $ hg up "build/v2" |
|
87 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
88 $ touch v2/WINDOWS |
|
89 $ hg add v2/WINDOWS |
|
90 $ hg commit -m "New commit on build/v2" -d "Mon Dec 11 11:22:16 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
91 |
|
92 7-8:amend-extract |
|
93 |
|
94 $ hg up 0 |
|
95 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
96 $ hg branch amend-extract |
|
97 marked working directory as branch amend-extract |
|
98 $ cat >> fileextract << EOF |
|
99 > # The file dedicated to be extracted |
|
100 > |
|
101 > 1 |
|
102 > 2 |
|
103 > 3 |
|
104 > 4 |
|
105 > 5 |
|
106 > 6 |
|
107 > 7 |
|
108 > 8 |
|
109 > 9 |
|
110 > 10 |
|
111 > |
|
112 > EOF |
|
113 $ hg add fileextract |
|
114 $ hg commit -m "Base file" -d "Fri Dec 08 15:04:09 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
115 |
|
116 $ echo "badbadfile" > badfile |
|
117 $ hg add badfile |
|
118 $ cat > fileextract << EOF |
|
119 > # The file dedicated to be extracted |
|
120 > |
|
121 > 0 |
|
122 > 1 |
|
123 > 2 |
|
124 > 3 |
|
125 > 4 |
|
126 > 5 |
|
127 > 6 |
|
128 > 7 |
|
129 > 8 |
|
130 > 9 |
|
131 > 10 |
|
132 > 42 |
|
133 > |
|
134 > EOF |
|
135 $ hg commit -m "Commit to be extracted" -d "Fri Dec 08 15:28:46 2017 +0100" -u "Bad User" |
|
136 |
|
137 9: prune |
|
138 |
|
139 $ hg up 0 |
|
140 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
141 $ hg branch prune |
|
142 marked working directory as branch prune |
|
143 $ touch filetoprune |
|
144 $ hg add filetoprune |
|
145 $ hg commit -m "Commit to prune" -d "Fri Dec 08 16:12:23 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
146 |
|
147 $ hg export |
|
148 # HG changeset patch |
|
149 # User Boris Feld <boris.feld@octobus.net> |
|
150 # Date 1512745943 -3600 |
|
151 # Fri Dec 08 16:12:23 2017 +0100 |
|
152 # Branch prune |
|
153 # Node ID 324b72ebbb217eb34975c65c794a7d9408a88675 |
|
154 # Parent d2eb2ac6a5bd73b2cc78fca3489488b2b0fdf8b1 |
|
155 Commit to prune |
|
156 |
|
157 10-12: fold |
|
158 |
|
159 $ hg up 0 |
|
160 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
161 $ hg branch fold |
|
162 marked working directory as branch fold |
|
163 $ mkdir test |
|
164 $ echo "assert 42 = 0" > test/unit |
|
165 $ hg add test/unit |
|
166 $ hg commit -m "add a test" -d "Fri Dec 08 16:49:45 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
167 |
|
168 $ echo "assert 42 = 43" > test/unit |
|
169 $ hg commit -m "Fix the test" -d "Fri Dec 08 16:50:17 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
170 |
|
171 $ echo "assert 42 = 42" > test/unit |
|
172 $ hg commit -m "Really fix the test" -d "Fri Dec 08 16:50:38 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
173 |
|
174 $ hg export |
|
175 # HG changeset patch |
|
176 # User Boris Feld <boris.feld@octobus.net> |
|
177 # Date 1512748238 -3600 |
|
178 # Fri Dec 08 16:50:38 2017 +0100 |
|
179 # Branch fold |
|
180 # Node ID 966df9f031c13cd37c685b6c2a2e7423935cef56 |
|
181 # Parent b316dc02bddce9fa1f8676a0feeccdeb1bea03ae |
|
182 Really fix the test |
|
183 |
|
184 diff -r b316dc02bddc -r 966df9f031c1 test/unit |
|
185 --- a/test/unit Fri Dec 08 16:50:17 2017 +0100 |
|
186 +++ b/test/unit Fri Dec 08 16:50:38 2017 +0100 |
|
187 @@ -1,1 +1,1 @@ |
|
188 -assert 42 = 43 |
|
189 +assert 42 = 42 |
|
190 |
|
191 13: split |
|
192 |
|
193 $ hg up 0 |
|
194 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
195 $ hg branch split |
|
196 marked working directory as branch split |
|
197 $ mkdir src |
|
198 $ touch src/A src/B src/C |
|
199 $ hg add src/* |
|
200 $ hg commit -m "To be splitted" -d "Fri Dec 08 17:33:15 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
201 |
|
202 14-16: histedit |
|
203 |
|
204 $ hg up 0 |
|
205 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
206 $ hg branch histedit |
|
207 marked working directory as branch histedit |
|
208 |
|
209 $ hg commit -m "First commit on histedit branch" -d "Fri Dec 09 17:33:15 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
210 |
|
211 $ mkdir myfeature |
|
212 $ touch myfeature/code |
|
213 $ hg add myfeature/code |
|
214 $ hg commit -m "Add code for myfeature" -d "Fri Dec 09 17:35:15 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
215 |
|
216 $ touch myfeature/test |
|
217 $ hg add myfeature/test |
|
218 $ hg commit -m "Add test for myfeature" -d "Fri Dec 09 17:37:15 2017 +0100" -u "Boris Feld <boris.feld@octobus.net>" |
|
219 |
|
220 $ cp -R $TESTTMP/base $TESTDIR/base-repos/init |
|
221 |
|
222 $ hg log -G |
|
223 @ changeset: 16:1b1e58a9ed27 |
|
224 | branch: histedit |
|
225 | tag: tip |
|
226 | user: Boris Feld <boris.feld@octobus.net> |
|
227 | date: Sat Dec 09 17:37:15 2017 +0100 |
|
228 | summary: Add test for myfeature |
|
229 | |
|
230 o changeset: 15:23eb6f9e4c51 |
|
231 | branch: histedit |
|
232 | user: Boris Feld <boris.feld@octobus.net> |
|
233 | date: Sat Dec 09 17:35:15 2017 +0100 |
|
234 | summary: Add code for myfeature |
|
235 | |
|
236 o changeset: 14:d102c718e607 |
|
237 | branch: histedit |
|
238 | parent: 0:d2eb2ac6a5bd |
|
239 | user: Boris Feld <boris.feld@octobus.net> |
|
240 | date: Sat Dec 09 17:33:15 2017 +0100 |
|
241 | summary: First commit on histedit branch |
|
242 | |
|
243 | o changeset: 13:5d5029b9daed |
|
244 |/ branch: split |
|
245 | parent: 0:d2eb2ac6a5bd |
|
246 | user: Boris Feld <boris.feld@octobus.net> |
|
247 | date: Fri Dec 08 17:33:15 2017 +0100 |
|
248 | summary: To be splitted |
|
249 | |
|
250 | o changeset: 12:966df9f031c1 |
|
251 | | branch: fold |
|
252 | | user: Boris Feld <boris.feld@octobus.net> |
|
253 | | date: Fri Dec 08 16:50:38 2017 +0100 |
|
254 | | summary: Really fix the test |
|
255 | | |
|
256 | o changeset: 11:b316dc02bddc |
|
257 | | branch: fold |
|
258 | | user: Boris Feld <boris.feld@octobus.net> |
|
259 | | date: Fri Dec 08 16:50:17 2017 +0100 |
|
260 | | summary: Fix the test |
|
261 | | |
|
262 | o changeset: 10:03174536bb2a |
|
263 |/ branch: fold |
|
264 | parent: 0:d2eb2ac6a5bd |
|
265 | user: Boris Feld <boris.feld@octobus.net> |
|
266 | date: Fri Dec 08 16:49:45 2017 +0100 |
|
267 | summary: add a test |
|
268 | |
|
269 | o changeset: 9:324b72ebbb21 |
|
270 |/ branch: prune |
|
271 | parent: 0:d2eb2ac6a5bd |
|
272 | user: Boris Feld <boris.feld@octobus.net> |
|
273 | date: Fri Dec 08 16:12:23 2017 +0100 |
|
274 | summary: Commit to prune |
|
275 | |
|
276 | o changeset: 8:e288d12d5e96 |
|
277 | | branch: amend-extract |
|
278 | | user: Bad User |
|
279 | | date: Fri Dec 08 15:28:46 2017 +0100 |
|
280 | | summary: Commit to be extracted |
|
281 | | |
|
282 | o changeset: 7:4ae0d1de7a58 |
|
283 |/ branch: amend-extract |
|
284 | parent: 0:d2eb2ac6a5bd |
|
285 | user: Boris Feld <boris.feld@octobus.net> |
|
286 | date: Fri Dec 08 15:04:09 2017 +0100 |
|
287 | summary: Base file |
|
288 | |
|
289 | o changeset: 6:0e694460372e |
|
290 | | branch: build/v2 |
|
291 | | parent: 2:f3bd0ab4ee87 |
|
292 | | user: Boris Feld <boris.feld@octobus.net> |
|
293 | | date: Mon Dec 11 11:22:16 2017 +0100 |
|
294 | | summary: New commit on build/v2 |
|
295 | | |
|
296 | | o changeset: 5:39e9774ab30b |
|
297 | | | branch: build/linuxsupport-v2 |
|
298 | | | user: Boris Feld <boris.feld@octobus.net> |
|
299 | | | date: Mon Dec 11 11:21:02 2017 +0100 |
|
300 | | | summary: Third commit on build/linuxsupport-v2 |
|
301 | | | |
|
302 | | o changeset: 4:5ad93176b041 |
|
303 | | | branch: build/linuxsupport-v2 |
|
304 | | | user: Boris Feld <boris.feld@octobus.net> |
|
305 | | | date: Mon Dec 11 11:20:24 2017 +0100 |
|
306 | | | summary: Second commit on build/linuxsupport-v2. |
|
307 | | | |
|
308 | | o changeset: 3:424916b62f4c |
|
309 | |/ branch: build/linuxsupport-v2 |
|
310 | | user: Boris Feld <boris.feld@octobus.net> |
|
311 | | date: Thu Dec 07 16:46:32 2017 +0100 |
|
312 | | summary: First commit on build/linuxsupport-v2 |
|
313 | | |
|
314 | o changeset: 2:f3bd0ab4ee87 |
|
315 |/ branch: build/v2 |
|
316 | parent: 0:d2eb2ac6a5bd |
|
317 | user: Boris Feld <boris.feld@octobus.net> |
|
318 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
319 | summary: First commit on build/v2 |
|
320 | |
|
321 | o changeset: 1:5d48a444aba7 |
|
322 |/ branch: typo |
|
323 | user: Boris Feld <boris.feld@octobus.net> |
|
324 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
325 | summary: Fx bug |
|
326 | |
|
327 o changeset: 0:d2eb2ac6a5bd |
|
328 user: Boris Feld <boris.feld@octobus.net> |
|
329 date: Thu Dec 07 11:26:05 2017 +0100 |
|
330 summary: ROOT |
|
331 |
|
332 |
|
333 Amend |
|
334 ----- |
|
335 |
|
336 $ cp -R $TESTTMP/base $TESTTMP/evolve_training_repo |
|
337 $ cd $TESTTMP/evolve_training_repo |
|
338 |
|
339 $ hg update typo |
|
340 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
341 |
|
342 BEFORE |
|
343 $ hg log -G -v -r "::typo" -T "{rev} {phase}\n" |
|
344 @ 1 draft |
|
345 | |
|
346 o 0 public |
|
347 |
|
348 $ graph $TESTDIR/graphs/fix-bug-1.dot -r '::typo' -T "{shortest(node, 8)}" --public=yes |
|
349 Wrote */graphs/fix-bug-1.dot (glob) |
|
350 .. graphviz:: |
|
351 |
|
352 strict digraph "Mercurial graph" { |
|
353 graph [rankdir=LR, |
|
354 splines=polyline |
|
355 ]; |
|
356 node [label="\N"]; |
|
357 0 [fillcolor="#7F7FFF", |
|
358 fixedsize=true, |
|
359 group=default, |
|
360 height=1, |
|
361 label=d2eb2ac6, |
|
362 pin=true, |
|
363 pos="1,0!", |
|
364 shape=circle, |
|
365 style=filled, |
|
366 width=1]; |
|
367 1 [fillcolor="#7F7FFF", |
|
368 fixedsize=true, |
|
369 group=typo, |
|
370 height=1, |
|
371 label="5d48a444", |
|
372 pin=true, |
|
373 pos="2,1!", |
|
374 shape=circle, |
|
375 style=filled, |
|
376 width=1]; |
|
377 0 -> 1 [penwidth=2.0]; |
|
378 } |
|
379 |
|
380 $ html_output $TESTDIR/output/fix-a-bug-base.log log -G -r "::typo" |
|
381 @ <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
|
382 | branch: typo |
|
383 | user: Boris Feld <boris.feld@octobus.net> |
|
384 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
385 | summary: Fx bug |
|
386 | |
|
387 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
388 user: Boris Feld <boris.feld@octobus.net> |
|
389 date: Thu Dec 07 11:26:05 2017 +0100 |
|
390 summary: ROOT |
|
391 |
|
392 $ html_output $TESTDIR/output/fix-a-bug-base-summary.log summary |
|
393 <span style="color:olive;">parent: 1:5d48a444aba7 </span> |
|
394 Fx bug |
|
395 branch: typo |
|
396 commit: (clean) |
|
397 update: (current) |
|
398 phases: 16 draft |
|
399 |
|
400 Commit with Evolve |
|
401 $ hg commit --amend --message "Fix bug" |
|
402 |
|
403 $ html_output $TESTDIR/output/amend-after.log log -G -r "::typo" |
|
404 @ <span style="color:olive;">changeset: 17:708369dc1bfe</span> |
|
405 | branch: typo |
|
406 | tag: tip |
|
407 | parent: 0:d2eb2ac6a5bd |
|
408 | user: Boris Feld <boris.feld@octobus.net> |
|
409 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
410 | summary: Fix bug |
|
411 | |
|
412 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
413 user: Boris Feld <boris.feld@octobus.net> |
|
414 date: Thu Dec 07 11:26:05 2017 +0100 |
|
415 summary: ROOT |
|
416 |
|
417 $ html_output $TESTDIR/output/fix-a-bug-with-evolve-2.log log -G -r "::branch(typo)" --hidden |
|
418 @ <span style="color:olive;">changeset: 17:708369dc1bfe</span> |
|
419 | branch: typo |
|
420 | tag: tip |
|
421 | parent: 0:d2eb2ac6a5bd |
|
422 | user: Boris Feld <boris.feld@octobus.net> |
|
423 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
424 | summary: Fix bug |
|
425 | |
|
426 | x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
|
427 |/ branch: typo |
|
428 | user: Boris Feld <boris.feld@octobus.net> |
|
429 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
430 | obsolete: reworded using amend as 17:708369dc1bfe |
|
431 | summary: Fx bug |
|
432 | |
|
433 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
434 user: Boris Feld <boris.feld@octobus.net> |
|
435 date: Thu Dec 07 11:26:05 2017 +0100 |
|
436 summary: ROOT |
|
437 |
|
438 Mark everything as public for the graph |
|
439 |
|
440 $ graph $TESTDIR/graphs/fix-bug-2.dot -r '::typo' -T "{shortest(node, 8)}" --public=yes |
|
441 Wrote */graphs/fix-bug-2.dot (glob) |
|
442 .. graphviz:: |
|
443 |
|
444 strict digraph "Mercurial graph" { |
|
445 graph [rankdir=LR, |
|
446 splines=polyline |
|
447 ]; |
|
448 node [label="\N"]; |
|
449 0 [fillcolor="#7F7FFF", |
|
450 fixedsize=true, |
|
451 group=default, |
|
452 height=1, |
|
453 label=d2eb2ac6, |
|
454 pin=true, |
|
455 pos="1,0!", |
|
456 shape=circle, |
|
457 style=filled, |
|
458 width=1]; |
|
459 17 [fillcolor="#7F7FFF", |
|
460 fixedsize=true, |
|
461 group=typo, |
|
462 height=1, |
|
463 label="708369dc", |
|
464 pin=true, |
|
465 pos="2,17!", |
|
466 shape=circle, |
|
467 style=filled, |
|
468 width=1]; |
|
469 0 -> 17 [penwidth=2.0]; |
|
470 } |
|
471 |
|
472 $ graph $TESTDIR/graphs/fix-bug-3.dot -r '::branch(typo)' --hidden -T "{shortest(node, 8)}" --public=yes |
|
473 Wrote */graphs/fix-bug-3.dot (glob) |
|
474 .. graphviz:: |
|
475 |
|
476 strict digraph "Mercurial graph" { |
|
477 graph [rankdir=LR, |
|
478 splines=polyline |
|
479 ]; |
|
480 node [label="\N"]; |
|
481 0 [fillcolor="#7F7FFF", |
|
482 fixedsize=true, |
|
483 group=default, |
|
484 height=1, |
|
485 label=d2eb2ac6, |
|
486 pin=true, |
|
487 pos="1,0!", |
|
488 shape=circle, |
|
489 style=filled, |
|
490 width=1]; |
|
491 1 [fillcolor="#DFDFFF", |
|
492 fixedsize=true, |
|
493 group=typo_extinct, |
|
494 height=1, |
|
495 label="5d48a444", |
|
496 pin=true, |
|
497 pos="2,1!", |
|
498 shape=circle, |
|
499 style="dotted, filled", |
|
500 width=1]; |
|
501 0 -> 1 [penwidth=2.0]; |
|
502 17 [fillcolor="#7F7FFF", |
|
503 fixedsize=true, |
|
504 group=typo, |
|
505 height=1, |
|
506 label="708369dc", |
|
507 pin=true, |
|
508 pos="3,17!", |
|
509 shape=circle, |
|
510 style=filled, |
|
511 width=1]; |
|
512 0 -> 17 [penwidth=2.0]; |
|
513 1 -> 17 [arrowtail=dot, |
|
514 dir=back, |
|
515 minlen=0, |
|
516 penwidth=2.0, |
|
517 style=dashed]; |
|
518 } |
|
519 |
|
520 $ html_output $TESTDIR/output/amend-after.log log -G -r "::typo" |
|
521 @ <span style="color:olive;">changeset: 17:708369dc1bfe</span> |
|
522 | branch: typo |
|
523 | tag: tip |
|
524 | parent: 0:d2eb2ac6a5bd |
|
525 | user: Boris Feld <boris.feld@octobus.net> |
|
526 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
527 | summary: Fix bug |
|
528 | |
|
529 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
530 user: Boris Feld <boris.feld@octobus.net> |
|
531 date: Thu Dec 07 11:26:05 2017 +0100 |
|
532 summary: ROOT |
|
533 |
|
534 |
|
535 $ html_output $TESTDIR/output/amend-obslog-after.log obslog -G -r "typo" |
|
536 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
|
537 | |
|
538 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
|
539 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
540 |
|
541 $ html_output $TESTDIR/output/amend-obslog-patch-after.log obslog -G -r "typo" --patch |
|
542 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
|
543 | |
|
544 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
|
545 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
546 --- a/5d48a444aba7-changeset-description |
|
547 +++ b/708369dc1bfe-changeset-description |
|
548 @@ -1,1 +1,1 @@ |
|
549 -Fx bug |
|
550 +Fix bug |
|
551 |
|
552 |
|
553 $ html_output $TESTDIR/output/amend-obslog-all-after.log obslog --all -G -r "precursors(typo)" --hidden |
|
554 @ <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
|
555 | |
|
556 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
|
557 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
558 |
|
559 |
|
560 Rebase |
|
561 ------ |
|
562 |
|
563 Before |
|
564 $ hg up build/linuxsupport-v2 |
|
565 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
566 |
|
567 $ html_output $TESTDIR/output/rebase-before.log log -G -r '::desc(v2)' |
|
568 o <span style="color:olive;">changeset: 6:0e694460372e</span> |
|
569 | branch: build/v2 |
|
570 | parent: 2:f3bd0ab4ee87 |
|
571 | user: Boris Feld <boris.feld@octobus.net> |
|
572 | date: Mon Dec 11 11:22:16 2017 +0100 |
|
573 | summary: New commit on build/v2 |
|
574 | |
|
575 | @ <span style="color:olive;">changeset: 5:39e9774ab30b</span> |
|
576 | | branch: build/linuxsupport-v2 |
|
577 | | user: Boris Feld <boris.feld@octobus.net> |
|
578 | | date: Mon Dec 11 11:21:02 2017 +0100 |
|
579 | | summary: Third commit on build/linuxsupport-v2 |
|
580 | | |
|
581 | o <span style="color:olive;">changeset: 4:5ad93176b041</span> |
|
582 | | branch: build/linuxsupport-v2 |
|
583 | | user: Boris Feld <boris.feld@octobus.net> |
|
584 | | date: Mon Dec 11 11:20:24 2017 +0100 |
|
585 | | summary: Second commit on build/linuxsupport-v2. |
|
586 | | |
|
587 | o <span style="color:olive;">changeset: 3:424916b62f4c</span> |
|
588 |/ branch: build/linuxsupport-v2 |
|
589 | user: Boris Feld <boris.feld@octobus.net> |
|
590 | date: Thu Dec 07 16:46:32 2017 +0100 |
|
591 | summary: First commit on build/linuxsupport-v2 |
|
592 | |
|
593 o <span style="color:olive;">changeset: 2:f3bd0ab4ee87</span> |
|
594 | branch: build/v2 |
|
595 | parent: 0:d2eb2ac6a5bd |
|
596 | user: Boris Feld <boris.feld@octobus.net> |
|
597 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
598 | summary: First commit on build/v2 |
|
599 | |
|
600 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
601 user: Boris Feld <boris.feld@octobus.net> |
|
602 date: Thu Dec 07 11:26:05 2017 +0100 |
|
603 summary: ROOT |
|
604 |
|
605 $ graph $TESTDIR/graphs/rebase-before.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --public=yes |
|
606 Wrote */graphs/rebase-before.dot (glob) |
|
607 .. graphviz:: |
|
608 |
|
609 strict digraph "Mercurial graph" { |
|
610 graph [rankdir=LR, |
|
611 splines=polyline |
|
612 ]; |
|
613 node [label="\N"]; |
|
614 0 [fillcolor="#7F7FFF", |
|
615 fixedsize=true, |
|
616 group=default, |
|
617 height=1, |
|
618 label=d2eb2ac6, |
|
619 pin=true, |
|
620 pos="1,0!", |
|
621 shape=circle, |
|
622 style=filled, |
|
623 width=1]; |
|
624 2 [fillcolor="#7F7FFF", |
|
625 fixedsize=true, |
|
626 group="build/v2", |
|
627 height=1, |
|
628 label=f3bd0ab4, |
|
629 pin=true, |
|
630 pos="2,2!", |
|
631 shape=circle, |
|
632 style=filled, |
|
633 width=1]; |
|
634 0 -> 2 [penwidth=2.0]; |
|
635 3 [fillcolor="#7F7FFF", |
|
636 fixedsize=true, |
|
637 group="build/linuxsupport-v2", |
|
638 height=1, |
|
639 label="424916b6", |
|
640 pin=true, |
|
641 pos="3,3!", |
|
642 shape=circle, |
|
643 style=filled, |
|
644 width=1]; |
|
645 2 -> 3 [penwidth=2.0]; |
|
646 6 [fillcolor="#7F7FFF", |
|
647 fixedsize=true, |
|
648 group="build/v2", |
|
649 height=1, |
|
650 label="0e694460", |
|
651 pin=true, |
|
652 pos="2,6!", |
|
653 shape=circle, |
|
654 style=filled, |
|
655 width=1]; |
|
656 2 -> 6 [penwidth=2.0]; |
|
657 4 [fillcolor="#7F7FFF", |
|
658 fixedsize=true, |
|
659 group="build/linuxsupport-v2", |
|
660 height=1, |
|
661 label="5ad93176", |
|
662 pin=true, |
|
663 pos="3,4!", |
|
664 shape=circle, |
|
665 style=filled, |
|
666 width=1]; |
|
667 3 -> 4 [penwidth=2.0]; |
|
668 5 [fillcolor="#7F7FFF", |
|
669 fixedsize=true, |
|
670 group="build/linuxsupport-v2", |
|
671 height=1, |
|
672 label="39e9774a", |
|
673 pin=true, |
|
674 pos="3,5!", |
|
675 shape=circle, |
|
676 style=filled, |
|
677 width=1]; |
|
678 4 -> 5 [penwidth=2.0]; |
|
679 } |
|
680 |
|
681 Do the rebase |
|
682 |
|
683 $ html_output $TESTDIR/output/rebase.log rebase -r "branch(build/linuxsupport-v2)" --dest build/v2 --keepbranches |
|
684 rebasing 3:424916b62f4c "First commit on build/linuxsupport-v2" |
|
685 rebasing 4:5ad93176b041 "Second commit on build/linuxsupport-v2." |
|
686 rebasing 5:39e9774ab30b "Third commit on build/linuxsupport-v2" |
|
687 |
|
688 After the rebase |
|
689 |
|
690 $ html_output $TESTDIR/output/rebase-after.log log -G -r '::desc(v2)' |
|
691 @ <span style="color:olive;">changeset: 20:3d2c8a2356a2</span> |
|
692 | branch: build/linuxsupport-v2 |
|
693 | tag: tip |
|
694 | user: Boris Feld <boris.feld@octobus.net> |
|
695 | date: Mon Dec 11 11:21:02 2017 +0100 |
|
696 | summary: Third commit on build/linuxsupport-v2 |
|
697 | |
|
698 o <span style="color:olive;">changeset: 19:4686378320d7</span> |
|
699 | branch: build/linuxsupport-v2 |
|
700 | user: Boris Feld <boris.feld@octobus.net> |
|
701 | date: Mon Dec 11 11:20:24 2017 +0100 |
|
702 | summary: Second commit on build/linuxsupport-v2. |
|
703 | |
|
704 o <span style="color:olive;">changeset: 18:7b62ce2c283e</span> |
|
705 | branch: build/linuxsupport-v2 |
|
706 | parent: 6:0e694460372e |
|
707 | user: Boris Feld <boris.feld@octobus.net> |
|
708 | date: Thu Dec 07 16:46:32 2017 +0100 |
|
709 | summary: First commit on build/linuxsupport-v2 |
|
710 | |
|
711 o <span style="color:olive;">changeset: 6:0e694460372e</span> |
|
712 | branch: build/v2 |
|
713 | parent: 2:f3bd0ab4ee87 |
|
714 | user: Boris Feld <boris.feld@octobus.net> |
|
715 | date: Mon Dec 11 11:22:16 2017 +0100 |
|
716 | summary: New commit on build/v2 |
|
717 | |
|
718 o <span style="color:olive;">changeset: 2:f3bd0ab4ee87</span> |
|
719 | branch: build/v2 |
|
720 | parent: 0:d2eb2ac6a5bd |
|
721 | user: Boris Feld <boris.feld@octobus.net> |
|
722 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
723 | summary: First commit on build/v2 |
|
724 | |
|
725 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
726 user: Boris Feld <boris.feld@octobus.net> |
|
727 date: Thu Dec 07 11:26:05 2017 +0100 |
|
728 summary: ROOT |
|
729 |
|
730 $ html_output $TESTDIR/output/rebase-after-hidden.log log -G -r '::desc(v2)' --hidden |
|
731 @ <span style="color:olive;">changeset: 20:3d2c8a2356a2</span> |
|
732 | branch: build/linuxsupport-v2 |
|
733 | tag: tip |
|
734 | user: Boris Feld <boris.feld@octobus.net> |
|
735 | date: Mon Dec 11 11:21:02 2017 +0100 |
|
736 | summary: Third commit on build/linuxsupport-v2 |
|
737 | |
|
738 o <span style="color:olive;">changeset: 19:4686378320d7</span> |
|
739 | branch: build/linuxsupport-v2 |
|
740 | user: Boris Feld <boris.feld@octobus.net> |
|
741 | date: Mon Dec 11 11:20:24 2017 +0100 |
|
742 | summary: Second commit on build/linuxsupport-v2. |
|
743 | |
|
744 o <span style="color:olive;">changeset: 18:7b62ce2c283e</span> |
|
745 | branch: build/linuxsupport-v2 |
|
746 | parent: 6:0e694460372e |
|
747 | user: Boris Feld <boris.feld@octobus.net> |
|
748 | date: Thu Dec 07 16:46:32 2017 +0100 |
|
749 | summary: First commit on build/linuxsupport-v2 |
|
750 | |
|
751 o <span style="color:olive;">changeset: 6:0e694460372e</span> |
|
752 | branch: build/v2 |
|
753 | parent: 2:f3bd0ab4ee87 |
|
754 | user: Boris Feld <boris.feld@octobus.net> |
|
755 | date: Mon Dec 11 11:22:16 2017 +0100 |
|
756 | summary: New commit on build/v2 |
|
757 | |
|
758 | x <span style="color:olive;">changeset: 5:39e9774ab30b</span> |
|
759 | | branch: build/linuxsupport-v2 |
|
760 | | user: Boris Feld <boris.feld@octobus.net> |
|
761 | | date: Mon Dec 11 11:21:02 2017 +0100 |
|
762 | | obsolete: rebased using rebase as 20:3d2c8a2356a2 |
|
763 | | summary: Third commit on build/linuxsupport-v2 |
|
764 | | |
|
765 | x <span style="color:olive;">changeset: 4:5ad93176b041</span> |
|
766 | | branch: build/linuxsupport-v2 |
|
767 | | user: Boris Feld <boris.feld@octobus.net> |
|
768 | | date: Mon Dec 11 11:20:24 2017 +0100 |
|
769 | | obsolete: rebased using rebase as 19:4686378320d7 |
|
770 | | summary: Second commit on build/linuxsupport-v2. |
|
771 | | |
|
772 | x <span style="color:olive;">changeset: 3:424916b62f4c</span> |
|
773 |/ branch: build/linuxsupport-v2 |
|
774 | user: Boris Feld <boris.feld@octobus.net> |
|
775 | date: Thu Dec 07 16:46:32 2017 +0100 |
|
776 | obsolete: rebased using rebase as 18:7b62ce2c283e |
|
777 | summary: First commit on build/linuxsupport-v2 |
|
778 | |
|
779 o <span style="color:olive;">changeset: 2:f3bd0ab4ee87</span> |
|
780 | branch: build/v2 |
|
781 | parent: 0:d2eb2ac6a5bd |
|
782 | user: Boris Feld <boris.feld@octobus.net> |
|
783 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
784 | summary: First commit on build/v2 |
|
785 | |
|
786 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
787 user: Boris Feld <boris.feld@octobus.net> |
|
788 date: Thu Dec 07 11:26:05 2017 +0100 |
|
789 summary: ROOT |
|
790 |
|
791 |
|
792 $ html_output $TESTDIR/output/rebase-obslog-after.log obslog -r "build/linuxsupport-v2" |
|
793 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
|
794 | |
|
795 x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
|
796 rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
797 |
|
798 $ graph $TESTDIR/graphs/rebase-after.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --public=yes |
|
799 Wrote */graphs/rebase-after.dot (glob) |
|
800 .. graphviz:: |
|
801 |
|
802 strict digraph "Mercurial graph" { |
|
803 graph [rankdir=LR, |
|
804 splines=polyline |
|
805 ]; |
|
806 node [label="\N"]; |
|
807 0 [fillcolor="#7F7FFF", |
|
808 fixedsize=true, |
|
809 group=default, |
|
810 height=1, |
|
811 label=d2eb2ac6, |
|
812 pin=true, |
|
813 pos="1,0!", |
|
814 shape=circle, |
|
815 style=filled, |
|
816 width=1]; |
|
817 2 [fillcolor="#7F7FFF", |
|
818 fixedsize=true, |
|
819 group="build/v2", |
|
820 height=1, |
|
821 label=f3bd0ab4, |
|
822 pin=true, |
|
823 pos="2,2!", |
|
824 shape=circle, |
|
825 style=filled, |
|
826 width=1]; |
|
827 0 -> 2 [penwidth=2.0]; |
|
828 6 [fillcolor="#7F7FFF", |
|
829 fixedsize=true, |
|
830 group="build/v2", |
|
831 height=1, |
|
832 label="0e694460", |
|
833 pin=true, |
|
834 pos="2,6!", |
|
835 shape=circle, |
|
836 style=filled, |
|
837 width=1]; |
|
838 2 -> 6 [penwidth=2.0]; |
|
839 18 [fillcolor="#7F7FFF", |
|
840 fixedsize=true, |
|
841 group="build/linuxsupport-v2", |
|
842 height=1, |
|
843 label="7b62ce2c", |
|
844 pin=true, |
|
845 pos="3,18!", |
|
846 shape=circle, |
|
847 style=filled, |
|
848 width=1]; |
|
849 6 -> 18 [penwidth=2.0]; |
|
850 19 [fillcolor="#7F7FFF", |
|
851 fixedsize=true, |
|
852 group="build/linuxsupport-v2", |
|
853 height=1, |
|
854 label=46863783, |
|
855 pin=true, |
|
856 pos="3,19!", |
|
857 shape=circle, |
|
858 style=filled, |
|
859 width=1]; |
|
860 18 -> 19 [penwidth=2.0]; |
|
861 20 [fillcolor="#7F7FFF", |
|
862 fixedsize=true, |
|
863 group="build/linuxsupport-v2", |
|
864 height=1, |
|
865 label="3d2c8a23", |
|
866 pin=true, |
|
867 pos="3,20!", |
|
868 shape=circle, |
|
869 style=filled, |
|
870 width=1]; |
|
871 19 -> 20 [penwidth=2.0]; |
|
872 } |
|
873 |
|
874 $ graph $TESTDIR/graphs/rebase-after-hidden.dot -r '::desc(v2)' -T "{shortest(node, 8)}" --hidden --public=yes |
|
875 Wrote */graphs/rebase-after-hidden.dot (glob) |
|
876 .. graphviz:: |
|
877 |
|
878 strict digraph "Mercurial graph" { |
|
879 graph [rankdir=LR, |
|
880 splines=polyline |
|
881 ]; |
|
882 node [label="\N"]; |
|
883 0 [fillcolor="#7F7FFF", |
|
884 fixedsize=true, |
|
885 group=default, |
|
886 height=1, |
|
887 label=d2eb2ac6, |
|
888 pin=true, |
|
889 pos="1,0!", |
|
890 shape=circle, |
|
891 style=filled, |
|
892 width=1]; |
|
893 2 [fillcolor="#7F7FFF", |
|
894 fixedsize=true, |
|
895 group="build/v2", |
|
896 height=1, |
|
897 label=f3bd0ab4, |
|
898 pin=true, |
|
899 pos="2,2!", |
|
900 shape=circle, |
|
901 style=filled, |
|
902 width=1]; |
|
903 0 -> 2 [penwidth=2.0]; |
|
904 3 [fillcolor="#DFDFFF", |
|
905 fixedsize=true, |
|
906 group="build/linuxsupport-v2_extinct", |
|
907 height=1, |
|
908 label="424916b6", |
|
909 pin=true, |
|
910 pos="3,3!", |
|
911 shape=circle, |
|
912 style="dotted, filled", |
|
913 width=1]; |
|
914 2 -> 3 [penwidth=2.0]; |
|
915 6 [fillcolor="#7F7FFF", |
|
916 fixedsize=true, |
|
917 group="build/v2", |
|
918 height=1, |
|
919 label="0e694460", |
|
920 pin=true, |
|
921 pos="2,6!", |
|
922 shape=circle, |
|
923 style=filled, |
|
924 width=1]; |
|
925 2 -> 6 [penwidth=2.0]; |
|
926 18 [fillcolor="#7F7FFF", |
|
927 fixedsize=true, |
|
928 group="build/linuxsupport-v2", |
|
929 height=1, |
|
930 label="7b62ce2c", |
|
931 pin=true, |
|
932 pos="4,18!", |
|
933 shape=circle, |
|
934 style=filled, |
|
935 width=1]; |
|
936 3 -> 18 [arrowtail=dot, |
|
937 dir=back, |
|
938 minlen=0, |
|
939 penwidth=2.0, |
|
940 style=dashed]; |
|
941 4 [fillcolor="#DFDFFF", |
|
942 fixedsize=true, |
|
943 group="build/linuxsupport-v2_extinct", |
|
944 height=1, |
|
945 label="5ad93176", |
|
946 pin=true, |
|
947 pos="3,4!", |
|
948 shape=circle, |
|
949 style="dotted, filled", |
|
950 width=1]; |
|
951 3 -> 4 [penwidth=2.0]; |
|
952 19 [fillcolor="#7F7FFF", |
|
953 fixedsize=true, |
|
954 group="build/linuxsupport-v2", |
|
955 height=1, |
|
956 label=46863783, |
|
957 pin=true, |
|
958 pos="4,19!", |
|
959 shape=circle, |
|
960 style=filled, |
|
961 width=1]; |
|
962 18 -> 19 [penwidth=2.0]; |
|
963 4 -> 19 [arrowtail=dot, |
|
964 dir=back, |
|
965 minlen=0, |
|
966 penwidth=2.0, |
|
967 style=dashed]; |
|
968 5 [fillcolor="#DFDFFF", |
|
969 fixedsize=true, |
|
970 group="build/linuxsupport-v2_extinct", |
|
971 height=1, |
|
972 label="39e9774a", |
|
973 pin=true, |
|
974 pos="3,5!", |
|
975 shape=circle, |
|
976 style="dotted, filled", |
|
977 width=1]; |
|
978 4 -> 5 [penwidth=2.0]; |
|
979 20 [fillcolor="#7F7FFF", |
|
980 fixedsize=true, |
|
981 group="build/linuxsupport-v2", |
|
982 height=1, |
|
983 label="3d2c8a23", |
|
984 pin=true, |
|
985 pos="4,20!", |
|
986 shape=circle, |
|
987 style=filled, |
|
988 width=1]; |
|
989 19 -> 20 [penwidth=2.0]; |
|
990 5 -> 20 [arrowtail=dot, |
|
991 dir=back, |
|
992 minlen=0, |
|
993 penwidth=2.0, |
|
994 style=dashed]; |
|
995 6 -> 18 [penwidth=2.0]; |
|
996 } |
|
997 |
|
998 Under the hood |
|
999 -------------- |
|
1000 |
|
1001 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/behind-the-hoods/ |
|
1002 |
|
1003 Amend |
|
1004 |
|
1005 $ html_output $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log log -G -r "::precursors(typo)" --hidden |
|
1006 x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
|
1007 | branch: typo |
|
1008 | user: Boris Feld <boris.feld@octobus.net> |
|
1009 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
1010 | obsolete: reworded using amend as 17:708369dc1bfe |
|
1011 | summary: Fx bug |
|
1012 | |
|
1013 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1014 user: Boris Feld <boris.feld@octobus.net> |
|
1015 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1016 summary: ROOT |
|
1017 |
|
1018 |
|
1019 XXX Remove the command line to avoid showing precursors and hidden revset |
|
1020 |
|
1021 $ tail -n +2 $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log | tee $TESTDIR/output/behind-the-hood-amend-before-hash-hidden.log |
|
1022 x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
|
1023 | branch: typo |
|
1024 | user: Boris Feld <boris.feld@octobus.net> |
|
1025 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
1026 | obsolete: reworded using amend as 17:708369dc1bfe |
|
1027 | summary: Fx bug |
|
1028 | |
|
1029 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1030 user: Boris Feld <boris.feld@octobus.net> |
|
1031 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1032 summary: ROOT |
|
1033 |
|
1034 |
|
1035 $ html_output $TESTDIR/output/behind-the-hood-amend-after.log log -G -r "::typo" |
|
1036 o <span style="color:olive;">changeset: 17:708369dc1bfe</span> |
|
1037 | branch: typo |
|
1038 | parent: 0:d2eb2ac6a5bd |
|
1039 | user: Boris Feld <boris.feld@octobus.net> |
|
1040 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
1041 | summary: Fix bug |
|
1042 | |
|
1043 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1044 user: Boris Feld <boris.feld@octobus.net> |
|
1045 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1046 summary: ROOT |
|
1047 |
|
1048 $ html_output $TESTDIR/output/under-the-hood-amend-after-log-hidden.log log -G -r "::branch(typo)" --hidden |
|
1049 o <span style="color:olive;">changeset: 17:708369dc1bfe</span> |
|
1050 | branch: typo |
|
1051 | parent: 0:d2eb2ac6a5bd |
|
1052 | user: Boris Feld <boris.feld@octobus.net> |
|
1053 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
1054 | summary: Fix bug |
|
1055 | |
|
1056 | x <span style="color:olive;">changeset: 1:5d48a444aba7</span> |
|
1057 |/ branch: typo |
|
1058 | user: Boris Feld <boris.feld@octobus.net> |
|
1059 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
1060 | obsolete: reworded using amend as 17:708369dc1bfe |
|
1061 | summary: Fx bug |
|
1062 | |
|
1063 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1064 user: Boris Feld <boris.feld@octobus.net> |
|
1065 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1066 summary: ROOT |
|
1067 |
|
1068 |
|
1069 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-patch.log obslog -G -r typo --patch |
|
1070 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
|
1071 | |
|
1072 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
|
1073 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1074 --- a/5d48a444aba7-changeset-description |
|
1075 +++ b/708369dc1bfe-changeset-description |
|
1076 @@ -1,1 +1,1 @@ |
|
1077 -Fx bug |
|
1078 +Fix bug |
|
1079 |
|
1080 |
|
1081 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog.log obslog -G -r typo |
|
1082 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
|
1083 | |
|
1084 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
|
1085 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1086 |
|
1087 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-no-all.log obslog -G -r "5d48a444aba7" --hidden |
|
1088 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
|
1089 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1090 |
|
1091 $ html_output $TESTDIR/output/under-the-hood-amend-after-obslog-all.log obslog -G -r "5d48a444aba7" --hidden --all |
|
1092 o <span style="color:olive;">708369dc1bfe</span> <span style="color:blue;">(17)</span> Fix bug |
|
1093 | |
|
1094 x <span style="color:olive;">5d48a444aba7</span> <span style="color:blue;">(1)</span> Fx bug |
|
1095 rewritten(description) as <span style="color:olive;">708369dc1bfe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1096 |
|
1097 |
|
1098 $ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog.log obslog -r build/linuxsupport-v2 |
|
1099 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
|
1100 | |
|
1101 x <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
|
1102 rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1103 |
|
1104 $ html_output $TESTDIR/output/under-the-hood-rebase-after-obslog-branch.log obslog -r "branch('build/linuxsupport-v2')" |
|
1105 @ <span style="color:olive;">3d2c8a2356a2</span> <span style="color:blue;">(20)</span> Third commit on build/linuxsupport-v2 |
|
1106 | |
|
1107 | o <span style="color:olive;">4686378320d7</span> <span style="color:blue;">(19)</span> Second commit on build/linuxsupport-v2. |
|
1108 | | |
|
1109 | | o <span style="color:olive;">7b62ce2c283e</span> <span style="color:blue;">(18)</span> First commit on build/linuxsupport-v2 |
|
1110 | | | |
|
1111 x | | <span style="color:olive;">39e9774ab30b</span> <span style="color:blue;">(5)</span> Third commit on build/linuxsupport-v2 |
|
1112 / / rewritten(parent) as <span style="color:olive;">3d2c8a2356a2</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1113 | | |
|
1114 | x <span style="color:olive;">424916b62f4c</span> <span style="color:blue;">(3)</span> First commit on build/linuxsupport-v2 |
|
1115 | rewritten(parent) as <span style="color:olive;">7b62ce2c283e</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1116 | |
|
1117 x <span style="color:olive;">5ad93176b041</span> <span style="color:blue;">(4)</span> Second commit on build/linuxsupport-v2. |
|
1118 rewritten(parent) as <span style="color:olive;">4686378320d7</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1119 |
|
1120 |
|
1121 |
|
1122 Rebase |
|
1123 |
|
1124 $ html_output $TESTDIR/output/behind-the-hood-rebase-before-hash-hidden.log log -G -r "::branch(build/v2) or ::precursors('build/linuxsupport-v2')" --hidden |
|
1125 o <span style="color:olive;">changeset: 6:0e694460372e</span> |
|
1126 | branch: build/v2 |
|
1127 | parent: 2:f3bd0ab4ee87 |
|
1128 | user: Boris Feld <boris.feld@octobus.net> |
|
1129 | date: Mon Dec 11 11:22:16 2017 +0100 |
|
1130 | summary: New commit on build/v2 |
|
1131 | |
|
1132 | x <span style="color:olive;">changeset: 5:39e9774ab30b</span> |
|
1133 | | branch: build/linuxsupport-v2 |
|
1134 | | user: Boris Feld <boris.feld@octobus.net> |
|
1135 | | date: Mon Dec 11 11:21:02 2017 +0100 |
|
1136 | | obsolete: rebased using rebase as 20:3d2c8a2356a2 |
|
1137 | | summary: Third commit on build/linuxsupport-v2 |
|
1138 | | |
|
1139 | x <span style="color:olive;">changeset: 4:5ad93176b041</span> |
|
1140 | | branch: build/linuxsupport-v2 |
|
1141 | | user: Boris Feld <boris.feld@octobus.net> |
|
1142 | | date: Mon Dec 11 11:20:24 2017 +0100 |
|
1143 | | obsolete: rebased using rebase as 19:4686378320d7 |
|
1144 | | summary: Second commit on build/linuxsupport-v2. |
|
1145 | | |
|
1146 | x <span style="color:olive;">changeset: 3:424916b62f4c</span> |
|
1147 |/ branch: build/linuxsupport-v2 |
|
1148 | user: Boris Feld <boris.feld@octobus.net> |
|
1149 | date: Thu Dec 07 16:46:32 2017 +0100 |
|
1150 | obsolete: rebased using rebase as 18:7b62ce2c283e |
|
1151 | summary: First commit on build/linuxsupport-v2 |
|
1152 | |
|
1153 o <span style="color:olive;">changeset: 2:f3bd0ab4ee87</span> |
|
1154 | branch: build/v2 |
|
1155 | parent: 0:d2eb2ac6a5bd |
|
1156 | user: Boris Feld <boris.feld@octobus.net> |
|
1157 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
1158 | summary: First commit on build/v2 |
|
1159 | |
|
1160 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1161 user: Boris Feld <boris.feld@octobus.net> |
|
1162 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1163 summary: ROOT |
|
1164 |
|
1165 |
|
1166 $ html_output $TESTDIR/output/behind-the-hood-rebase-after.log log -G -r "::desc(v2)" |
|
1167 @ <span style="color:olive;">changeset: 20:3d2c8a2356a2</span> |
|
1168 | branch: build/linuxsupport-v2 |
|
1169 | tag: tip |
|
1170 | user: Boris Feld <boris.feld@octobus.net> |
|
1171 | date: Mon Dec 11 11:21:02 2017 +0100 |
|
1172 | summary: Third commit on build/linuxsupport-v2 |
|
1173 | |
|
1174 o <span style="color:olive;">changeset: 19:4686378320d7</span> |
|
1175 | branch: build/linuxsupport-v2 |
|
1176 | user: Boris Feld <boris.feld@octobus.net> |
|
1177 | date: Mon Dec 11 11:20:24 2017 +0100 |
|
1178 | summary: Second commit on build/linuxsupport-v2. |
|
1179 | |
|
1180 o <span style="color:olive;">changeset: 18:7b62ce2c283e</span> |
|
1181 | branch: build/linuxsupport-v2 |
|
1182 | parent: 6:0e694460372e |
|
1183 | user: Boris Feld <boris.feld@octobus.net> |
|
1184 | date: Thu Dec 07 16:46:32 2017 +0100 |
|
1185 | summary: First commit on build/linuxsupport-v2 |
|
1186 | |
|
1187 o <span style="color:olive;">changeset: 6:0e694460372e</span> |
|
1188 | branch: build/v2 |
|
1189 | parent: 2:f3bd0ab4ee87 |
|
1190 | user: Boris Feld <boris.feld@octobus.net> |
|
1191 | date: Mon Dec 11 11:22:16 2017 +0100 |
|
1192 | summary: New commit on build/v2 |
|
1193 | |
|
1194 o <span style="color:olive;">changeset: 2:f3bd0ab4ee87</span> |
|
1195 | branch: build/v2 |
|
1196 | parent: 0:d2eb2ac6a5bd |
|
1197 | user: Boris Feld <boris.feld@octobus.net> |
|
1198 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
1199 | summary: First commit on build/v2 |
|
1200 | |
|
1201 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1202 user: Boris Feld <boris.feld@octobus.net> |
|
1203 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1204 summary: ROOT |
|
1205 |
|
1206 |
|
1207 Amend-extract |
|
1208 ------------- |
|
1209 |
|
1210 $ hg update amend-extract |
|
1211 2 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
1212 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/amend-evolve-command/ |
|
1213 |
|
1214 $ html_output $TESTDIR/output/amend-extract-before.log log -G -r "::amend-extract" |
|
1215 @ <span style="color:olive;">changeset: 8:e288d12d5e96</span> |
|
1216 | branch: amend-extract |
|
1217 | user: Bad User |
|
1218 | date: Fri Dec 08 15:28:46 2017 +0100 |
|
1219 | summary: Commit to be extracted |
|
1220 | |
|
1221 o <span style="color:olive;">changeset: 7:4ae0d1de7a58</span> |
|
1222 | branch: amend-extract |
|
1223 | parent: 0:d2eb2ac6a5bd |
|
1224 | user: Boris Feld <boris.feld@octobus.net> |
|
1225 | date: Fri Dec 08 15:04:09 2017 +0100 |
|
1226 | summary: Base file |
|
1227 | |
|
1228 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1229 user: Boris Feld <boris.feld@octobus.net> |
|
1230 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1231 summary: ROOT |
|
1232 |
|
1233 |
|
1234 $ graph $TESTDIR/graphs/amend-extract-before.dot -r '::amend-extract' -T "{shortest(node, 8)}" --hidden --public=yes |
|
1235 Wrote */graphs/amend-extract-before.dot (glob) |
|
1236 .. graphviz:: |
|
1237 |
|
1238 strict digraph "Mercurial graph" { |
|
1239 graph [rankdir=LR, |
|
1240 splines=polyline |
|
1241 ]; |
|
1242 node [label="\N"]; |
|
1243 0 [fillcolor="#7F7FFF", |
|
1244 fixedsize=true, |
|
1245 group=default, |
|
1246 height=1, |
|
1247 label=d2eb2ac6, |
|
1248 pin=true, |
|
1249 pos="1,0!", |
|
1250 shape=circle, |
|
1251 style=filled, |
|
1252 width=1]; |
|
1253 7 [fillcolor="#7F7FFF", |
|
1254 fixedsize=true, |
|
1255 group="amend-extract", |
|
1256 height=1, |
|
1257 label="4ae0d1de", |
|
1258 pin=true, |
|
1259 pos="2,7!", |
|
1260 shape=circle, |
|
1261 style=filled, |
|
1262 width=1]; |
|
1263 0 -> 7 [penwidth=2.0]; |
|
1264 8 [fillcolor="#7F7FFF", |
|
1265 fixedsize=true, |
|
1266 group="amend-extract", |
|
1267 height=1, |
|
1268 label=e288d12d, |
|
1269 pin=true, |
|
1270 pos="2,8!", |
|
1271 shape=circle, |
|
1272 style=filled, |
|
1273 width=1]; |
|
1274 7 -> 8 [penwidth=2.0]; |
|
1275 } |
|
1276 |
|
1277 Amend User |
|
1278 |
|
1279 $ html_output $TESTDIR/output/amend-user.log amend --user "Good User" |
|
1280 |
|
1281 After amend user |
|
1282 |
|
1283 $ html_output $TESTDIR/output/amend-user-after-export.log export . |
|
1284 # HG changeset patch |
|
1285 # User Good User |
|
1286 # Date 1512743326 -3600 |
|
1287 # Fri Dec 08 15:28:46 2017 +0100 |
|
1288 # Branch amend-extract |
|
1289 # Node ID 5935c1c3ad24c4d3338d94473261eb89a73ef0d5 |
|
1290 # Parent 4ae0d1de7a58916e6f24fdc42e890a71fccbd931 |
|
1291 Commit to be extracted |
|
1292 |
|
1293 <span style="font-weight:bold;">diff -r 4ae0d1de7a58 -r 5935c1c3ad24 badfile</span> |
|
1294 <span style="color:red;font-weight:bold;">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span> |
|
1295 <span style="color:green;font-weight:bold;">+++ b/badfile Fri Dec 08 15:28:46 2017 +0100</span> |
|
1296 <span style="color:purple;">@@ -0,0 +1,1 @@</span> |
|
1297 <span style="color:green;">+badbadfile</span> |
|
1298 <span style="font-weight:bold;">diff -r 4ae0d1de7a58 -r 5935c1c3ad24 fileextract</span> |
|
1299 <span style="color:red;font-weight:bold;">--- a/fileextract Fri Dec 08 15:04:09 2017 +0100</span> |
|
1300 <span style="color:green;font-weight:bold;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span> |
|
1301 <span style="color:purple;">@@ -1,5 +1,6 @@</span> |
|
1302 # The file dedicated to be extracted |
|
1303 |
|
1304 <span style="color:green;">+0</span> |
|
1305 1 |
|
1306 2 |
|
1307 3 |
|
1308 <span style="color:purple;">@@ -10,4 +11,5 @@</span> |
|
1309 8 |
|
1310 9 |
|
1311 10 |
|
1312 <span style="color:green;">+42</span> |
|
1313 |
|
1314 |
|
1315 Amend extract the bad file |
|
1316 |
|
1317 $ html_output $TESTDIR/output/amend-extract-badfile.log amend --extract badfile |
|
1318 |
|
1319 After extract the bad file |
|
1320 |
|
1321 $ html_output $TESTDIR/output/amend-extract-badfile-after-export.log export -r . |
|
1322 # HG changeset patch |
|
1323 # User Good User |
|
1324 # Date 1512743326 -3600 |
|
1325 # Fri Dec 08 15:28:46 2017 +0100 |
|
1326 # Branch amend-extract |
|
1327 # Node ID 1e04751ef00ae76e357fe083f08e3f2234c3b26b |
|
1328 # Parent 4ae0d1de7a58916e6f24fdc42e890a71fccbd931 |
|
1329 Commit to be extracted |
|
1330 |
|
1331 <span style="font-weight:bold;">diff -r 4ae0d1de7a58 -r 1e04751ef00a fileextract</span> |
|
1332 <span style="color:red;font-weight:bold;">--- a/fileextract Fri Dec 08 15:04:09 2017 +0100</span> |
|
1333 <span style="color:green;font-weight:bold;">+++ b/fileextract Fri Dec 08 15:28:46 2017 +0100</span> |
|
1334 <span style="color:purple;">@@ -1,5 +1,6 @@</span> |
|
1335 # The file dedicated to be extracted |
|
1336 |
|
1337 <span style="color:green;">+0</span> |
|
1338 1 |
|
1339 2 |
|
1340 3 |
|
1341 <span style="color:purple;">@@ -10,4 +11,5 @@</span> |
|
1342 8 |
|
1343 9 |
|
1344 10 |
|
1345 <span style="color:green;">+42</span> |
|
1346 |
|
1347 |
|
1348 $ html_output $TESTDIR/output/amend-extract-badfile-after-status.log status |
|
1349 <span style="color:green;font-weight:bold;">A </span><span style="color:green;font-weight:bold;">badfile</span> |
|
1350 |
|
1351 $ html_output $TESTDIR/output/amend-extract-badfile-after-revert.log revert --all --no-backup |
|
1352 forgetting badfile |
|
1353 |
|
1354 $ rm badfile |
|
1355 |
|
1356 Amend extract the line |
|
1357 |
|
1358 $ html_output $TESTDIR/output/amend-extract.log amend --extract --interactive <<EOF |
|
1359 > y |
|
1360 > n |
|
1361 > y |
|
1362 > EOF |
|
1363 <span style="font-weight:bold;">diff --git a/fileextract b/fileextract</span> |
|
1364 2 hunks, 2 lines changed |
|
1365 <span style="color:olive;">examine changes to 'fileextract'? [Ynesfdaq?]</span> y |
|
1366 |
|
1367 <span style="color:purple;">@@ -1,5 +1,6 @@</span> |
|
1368 # The file dedicated to be extracted |
|
1369 |
|
1370 <span style="color:green;">+0</span> |
|
1371 1 |
|
1372 2 |
|
1373 3 |
|
1374 <span style="color:olive;">discard change 1/2 to 'fileextract'? [Ynesfdaq?]</span> n |
|
1375 |
|
1376 <span style="color:purple;">@@ -10,4 +11,5 @@</span> |
|
1377 8 |
|
1378 9 |
|
1379 10 |
|
1380 <span style="color:green;">+42</span> |
|
1381 |
|
1382 <span style="color:olive;">discard change 2/2 to 'fileextract'? [Ynesfdaq?]</span> y |
|
1383 |
|
1384 |
|
1385 $ html_output $TESTDIR/output/amend-extract-after-status.log status |
|
1386 <span style="color:blue;font-weight:bold;">M </span><span style="color:blue;font-weight:bold;">fileextract</span> |
|
1387 |
|
1388 $ html_output $TESTDIR/output/amend-extract-after-diff.log diff |
|
1389 <span style="font-weight:bold;">diff -r 76ace846a3f9 fileextract</span> |
|
1390 <span style="color:red;font-weight:bold;">--- a/fileextract Fri Dec 08 15:28:46 2017 +0100</span> |
|
1391 <span style="color:green;font-weight:bold;">+++ b/fileextract Thu Jan 01 00:00:00 1970 +0000</span> |
|
1392 <span style="color:purple;">@@ -11,4 +11,5 @@</span> |
|
1393 8 |
|
1394 9 |
|
1395 10 |
|
1396 <span style="color:green;">+42</span> |
|
1397 |
|
1398 |
|
1399 $ html_output $TESTDIR/output/amend-extract-after-revert.log revert --all --no-backup |
|
1400 reverting fileextract |
|
1401 |
|
1402 $ html_output $TESTDIR/output/amend-extract-after-obslog.log obslog -p -r . |
|
1403 @ <span style="color:olive;">76ace846a3f9</span> <span style="color:blue;">(24)</span> Commit to be extracted |
|
1404 | |
|
1405 x <span style="color:olive;">1e04751ef00a</span> <span style="color:blue;">(22)</span> Commit to be extracted |
|
1406 | rewritten(content) as <span style="color:olive;">76ace846a3f9</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1407 | diff -r 1e04751ef00a -r 76ace846a3f9 fileextract |
|
1408 | --- a/fileextract Fri Dec 08 15:28:46 2017 +0100 |
|
1409 | +++ b/fileextract Fri Dec 08 15:28:46 2017 +0100 |
|
1410 | @@ -11,5 +11,4 @@ |
|
1411 | 8 |
|
1412 | 9 |
|
1413 | 10 |
|
1414 | -42 |
|
1415 | |
|
1416 | |
|
1417 | |
|
1418 x <span style="color:olive;">5935c1c3ad24</span> <span style="color:blue;">(21)</span> Commit to be extracted |
|
1419 | rewritten(content) as <span style="color:olive;">1e04751ef00a</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1420 | diff -r 5935c1c3ad24 -r 1e04751ef00a badfile |
|
1421 | --- a/badfile Fri Dec 08 15:28:46 2017 +0100 |
|
1422 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1423 | @@ -1,1 +0,0 @@ |
|
1424 | -badbadfile |
|
1425 | |
|
1426 | |
|
1427 x <span style="color:olive;">e288d12d5e96</span> <span style="color:blue;">(8)</span> Commit to be extracted |
|
1428 rewritten(user) as <span style="color:olive;">5935c1c3ad24</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1429 |
|
1430 |
|
1431 $ graph $TESTDIR/graphs/amend-extract-after-hidden.dot -r "::desc(extracted)" -T "{shortest(node, 8)}" --hidden --public=yes |
|
1432 Wrote */graphs/amend-extract-after-hidden.dot (glob) |
|
1433 .. graphviz:: |
|
1434 |
|
1435 strict digraph "Mercurial graph" { |
|
1436 graph [rankdir=LR, |
|
1437 splines=polyline |
|
1438 ]; |
|
1439 node [label="\N"]; |
|
1440 0 [fillcolor="#7F7FFF", |
|
1441 fixedsize=true, |
|
1442 group=default, |
|
1443 height=1, |
|
1444 label=d2eb2ac6, |
|
1445 pin=true, |
|
1446 pos="1,0!", |
|
1447 shape=circle, |
|
1448 style=filled, |
|
1449 width=1]; |
|
1450 7 [fillcolor="#7F7FFF", |
|
1451 fixedsize=true, |
|
1452 group="amend-extract", |
|
1453 height=1, |
|
1454 label="4ae0d1de", |
|
1455 pin=true, |
|
1456 pos="2,7!", |
|
1457 shape=circle, |
|
1458 style=filled, |
|
1459 width=1]; |
|
1460 0 -> 7 [penwidth=2.0]; |
|
1461 8 [fillcolor="#DFDFFF", |
|
1462 fixedsize=true, |
|
1463 group="amend-extract_extinct", |
|
1464 height=1, |
|
1465 label=e288d12d, |
|
1466 pin=true, |
|
1467 pos="3,8!", |
|
1468 shape=circle, |
|
1469 style="dotted, filled", |
|
1470 width=1]; |
|
1471 7 -> 8 [penwidth=2.0]; |
|
1472 21 [fillcolor="#DFDFFF", |
|
1473 fixedsize=true, |
|
1474 group="amend-extract_extinct", |
|
1475 height=1, |
|
1476 label="5935c1c3", |
|
1477 pin=true, |
|
1478 pos="3,21!", |
|
1479 shape=circle, |
|
1480 style="dotted, filled", |
|
1481 width=1]; |
|
1482 7 -> 21 [penwidth=2.0]; |
|
1483 22 [fillcolor="#DFDFFF", |
|
1484 fixedsize=true, |
|
1485 group="amend-extract_extinct", |
|
1486 height=1, |
|
1487 label="1e04751e", |
|
1488 pin=true, |
|
1489 pos="3,22!", |
|
1490 shape=circle, |
|
1491 style="dotted, filled", |
|
1492 width=1]; |
|
1493 7 -> 22 [penwidth=2.0]; |
|
1494 24 [fillcolor="#7F7FFF", |
|
1495 fixedsize=true, |
|
1496 group="amend-extract", |
|
1497 height=1, |
|
1498 label="76ace846", |
|
1499 pin=true, |
|
1500 pos="2,24!", |
|
1501 shape=circle, |
|
1502 style=filled, |
|
1503 width=1]; |
|
1504 7 -> 24 [penwidth=2.0]; |
|
1505 8 -> 21 [arrowtail=dot, |
|
1506 dir=back, |
|
1507 minlen=0, |
|
1508 penwidth=2.0, |
|
1509 style=dashed]; |
|
1510 21 -> 22 [arrowtail=dot, |
|
1511 dir=back, |
|
1512 minlen=0, |
|
1513 penwidth=2.0, |
|
1514 style=dashed]; |
|
1515 22 -> 24 [arrowtail=dot, |
|
1516 dir=back, |
|
1517 minlen=0, |
|
1518 penwidth=2.0, |
|
1519 style=dashed]; |
|
1520 } |
|
1521 |
|
1522 Fold |
|
1523 ---- |
|
1524 |
|
1525 $ hg update fold |
|
1526 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1527 |
|
1528 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/fold/ |
|
1529 |
|
1530 $ html_output $TESTDIR/output/fold-before.log log -r "branch(fold)" -G -p |
|
1531 @ <span style="color:olive;">changeset: 12:966df9f031c1</span> |
|
1532 | branch: fold |
|
1533 | user: Boris Feld <boris.feld@octobus.net> |
|
1534 | date: Fri Dec 08 16:50:38 2017 +0100 |
|
1535 | summary: Really fix the test |
|
1536 | |
|
1537 | <span style="font-weight:bold;">diff -r b316dc02bddc -r 966df9f031c1 test/unit</span> |
|
1538 | <span style="color:red;font-weight:bold;">--- a/test/unit Fri Dec 08 16:50:17 2017 +0100</span> |
|
1539 | <span style="color:green;font-weight:bold;">+++ b/test/unit Fri Dec 08 16:50:38 2017 +0100</span> |
|
1540 | <span style="color:purple;">@@ -1,1 +1,1 @@</span> |
|
1541 | <span style="color:red;">-assert 42 = 43</span> |
|
1542 | <span style="color:green;">+assert 42 = 42</span> |
|
1543 | |
|
1544 o <span style="color:olive;">changeset: 11:b316dc02bddc</span> |
|
1545 | branch: fold |
|
1546 | user: Boris Feld <boris.feld@octobus.net> |
|
1547 | date: Fri Dec 08 16:50:17 2017 +0100 |
|
1548 | summary: Fix the test |
|
1549 | |
|
1550 | <span style="font-weight:bold;">diff -r 03174536bb2a -r b316dc02bddc test/unit</span> |
|
1551 | <span style="color:red;font-weight:bold;">--- a/test/unit Fri Dec 08 16:49:45 2017 +0100</span> |
|
1552 | <span style="color:green;font-weight:bold;">+++ b/test/unit Fri Dec 08 16:50:17 2017 +0100</span> |
|
1553 | <span style="color:purple;">@@ -1,1 +1,1 @@</span> |
|
1554 | <span style="color:red;">-assert 42 = 0</span> |
|
1555 | <span style="color:green;">+assert 42 = 43</span> |
|
1556 | |
|
1557 o <span style="color:olive;">changeset: 10:03174536bb2a</span> |
|
1558 | branch: fold |
|
1559 ~ parent: 0:d2eb2ac6a5bd |
|
1560 user: Boris Feld <boris.feld@octobus.net> |
|
1561 date: Fri Dec 08 16:49:45 2017 +0100 |
|
1562 summary: add a test |
|
1563 |
|
1564 <span style="font-weight:bold;">diff -r d2eb2ac6a5bd -r 03174536bb2a test/unit</span> |
|
1565 <span style="color:red;font-weight:bold;">--- /dev/null Thu Jan 01 00:00:00 1970 +0000</span> |
|
1566 <span style="color:green;font-weight:bold;">+++ b/test/unit Fri Dec 08 16:49:45 2017 +0100</span> |
|
1567 <span style="color:purple;">@@ -0,0 +1,1 @@</span> |
|
1568 <span style="color:green;">+assert 42 = 0</span> |
|
1569 |
|
1570 |
|
1571 $ graph $TESTDIR/graphs/fold-before.dot -r "::fold" -T "{shortest(node, 8)}" --public=yes |
|
1572 Wrote */graphs/fold-before.dot (glob) |
|
1573 .. graphviz:: |
|
1574 |
|
1575 strict digraph "Mercurial graph" { |
|
1576 graph [rankdir=LR, |
|
1577 splines=polyline |
|
1578 ]; |
|
1579 node [label="\N"]; |
|
1580 0 [fillcolor="#7F7FFF", |
|
1581 fixedsize=true, |
|
1582 group=default, |
|
1583 height=1, |
|
1584 label=d2eb2ac6, |
|
1585 pin=true, |
|
1586 pos="1,0!", |
|
1587 shape=circle, |
|
1588 style=filled, |
|
1589 width=1]; |
|
1590 10 [fillcolor="#7F7FFF", |
|
1591 fixedsize=true, |
|
1592 group=fold, |
|
1593 height=1, |
|
1594 label=03174536, |
|
1595 pin=true, |
|
1596 pos="2,10!", |
|
1597 shape=circle, |
|
1598 style=filled, |
|
1599 width=1]; |
|
1600 0 -> 10 [penwidth=2.0]; |
|
1601 11 [fillcolor="#7F7FFF", |
|
1602 fixedsize=true, |
|
1603 group=fold, |
|
1604 height=1, |
|
1605 label=b316dc02, |
|
1606 pin=true, |
|
1607 pos="2,11!", |
|
1608 shape=circle, |
|
1609 style=filled, |
|
1610 width=1]; |
|
1611 10 -> 11 [penwidth=2.0]; |
|
1612 12 [fillcolor="#7F7FFF", |
|
1613 fixedsize=true, |
|
1614 group=fold, |
|
1615 height=1, |
|
1616 label="966df9f0", |
|
1617 pin=true, |
|
1618 pos="2,12!", |
|
1619 shape=circle, |
|
1620 style=filled, |
|
1621 width=1]; |
|
1622 11 -> 12 [penwidth=2.0]; |
|
1623 } |
|
1624 |
|
1625 $ html_output $TESTDIR/output/fold.log fold --from -r "branch(fold)" -m "add a test" |
|
1626 3 changesets folded |
|
1627 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1628 |
|
1629 $ html_output $TESTDIR/output/fold-after.log log -r "::fold" -G |
|
1630 @ <span style="color:olive;">changeset: 25:dab6ed4b3c75</span> |
|
1631 | branch: fold |
|
1632 | tag: tip |
|
1633 | parent: 0:d2eb2ac6a5bd |
|
1634 | user: Boris Feld <boris.feld@octobus.net> |
|
1635 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1636 | summary: add a test |
|
1637 | |
|
1638 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1639 user: Boris Feld <boris.feld@octobus.net> |
|
1640 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1641 summary: ROOT |
|
1642 |
|
1643 |
|
1644 $ html_output $TESTDIR/output/fold-after-hidden.log log -r "::branch(fold)" -G --hidden |
|
1645 @ <span style="color:olive;">changeset: 25:dab6ed4b3c75</span> |
|
1646 | branch: fold |
|
1647 | tag: tip |
|
1648 | parent: 0:d2eb2ac6a5bd |
|
1649 | user: Boris Feld <boris.feld@octobus.net> |
|
1650 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1651 | summary: add a test |
|
1652 | |
|
1653 | x <span style="color:olive;">changeset: 12:966df9f031c1</span> |
|
1654 | | branch: fold |
|
1655 | | user: Boris Feld <boris.feld@octobus.net> |
|
1656 | | date: Fri Dec 08 16:50:38 2017 +0100 |
|
1657 | | obsolete: rewritten as 25:dab6ed4b3c75 |
|
1658 | | summary: Really fix the test |
|
1659 | | |
|
1660 | x <span style="color:olive;">changeset: 11:b316dc02bddc</span> |
|
1661 | | branch: fold |
|
1662 | | user: Boris Feld <boris.feld@octobus.net> |
|
1663 | | date: Fri Dec 08 16:50:17 2017 +0100 |
|
1664 | | obsolete: rewritten as 25:dab6ed4b3c75 |
|
1665 | | summary: Fix the test |
|
1666 | | |
|
1667 | x <span style="color:olive;">changeset: 10:03174536bb2a</span> |
|
1668 |/ branch: fold |
|
1669 | parent: 0:d2eb2ac6a5bd |
|
1670 | user: Boris Feld <boris.feld@octobus.net> |
|
1671 | date: Fri Dec 08 16:49:45 2017 +0100 |
|
1672 | obsolete: rewritten as 25:dab6ed4b3c75 |
|
1673 | summary: add a test |
|
1674 | |
|
1675 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1676 user: Boris Feld <boris.feld@octobus.net> |
|
1677 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1678 summary: ROOT |
|
1679 |
|
1680 |
|
1681 $ html_output $TESTDIR/output/fold-after-hidden-obslog.log obslog -r "." |
|
1682 @ <span style="color:olive;">dab6ed4b3c75</span> <span style="color:blue;">(25)</span> add a test |
|
1683 |\ |
|
1684 | \ |
|
1685 | |\ |
|
1686 x | | <span style="color:olive;">03174536bb2a</span> <span style="color:blue;">(10)</span> add a test |
|
1687 / / rewritten(date, content) as <span style="color:olive;">dab6ed4b3c75</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1688 | | |
|
1689 x | <span style="color:olive;">966df9f031c1</span> <span style="color:blue;">(12)</span> Really fix the test |
|
1690 / rewritten(description, date, parent, content) as <span style="color:olive;">dab6ed4b3c75</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1691 | |
|
1692 x <span style="color:olive;">b316dc02bddc</span> <span style="color:blue;">(11)</span> Fix the test |
|
1693 rewritten(description, date, parent, content) as <span style="color:olive;">dab6ed4b3c75</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1694 |
|
1695 |
|
1696 $ graph $TESTDIR/graphs/fold-after-hidden.log -r "::branch(fold)" -T "{shortest(node, 8)}" --hidden --public=yes |
|
1697 Wrote */graphs/fold-after-hidden.log (glob) |
|
1698 .. graphviz:: |
|
1699 |
|
1700 strict digraph "Mercurial graph" { |
|
1701 graph [rankdir=LR, |
|
1702 splines=polyline |
|
1703 ]; |
|
1704 node [label="\N"]; |
|
1705 0 [fillcolor="#7F7FFF", |
|
1706 fixedsize=true, |
|
1707 group=default, |
|
1708 height=1, |
|
1709 label=d2eb2ac6, |
|
1710 pin=true, |
|
1711 pos="1,0!", |
|
1712 shape=circle, |
|
1713 style=filled, |
|
1714 width=1]; |
|
1715 10 [fillcolor="#DFDFFF", |
|
1716 fixedsize=true, |
|
1717 group=fold_extinct, |
|
1718 height=1, |
|
1719 label=03174536, |
|
1720 pin=true, |
|
1721 pos="2,10!", |
|
1722 shape=circle, |
|
1723 style="dotted, filled", |
|
1724 width=1]; |
|
1725 0 -> 10 [penwidth=2.0]; |
|
1726 25 [fillcolor="#7F7FFF", |
|
1727 fixedsize=true, |
|
1728 group=fold, |
|
1729 height=1, |
|
1730 label=dab6ed4b, |
|
1731 pin=true, |
|
1732 pos="3,25!", |
|
1733 shape=circle, |
|
1734 style=filled, |
|
1735 width=1]; |
|
1736 0 -> 25 [penwidth=2.0]; |
|
1737 10 -> 25 [arrowtail=dot, |
|
1738 dir=back, |
|
1739 minlen=0, |
|
1740 penwidth=2.0, |
|
1741 style=dashed]; |
|
1742 11 [fillcolor="#DFDFFF", |
|
1743 fixedsize=true, |
|
1744 group=fold_extinct, |
|
1745 height=1, |
|
1746 label=b316dc02, |
|
1747 pin=true, |
|
1748 pos="2,11!", |
|
1749 shape=circle, |
|
1750 style="dotted, filled", |
|
1751 width=1]; |
|
1752 10 -> 11 [penwidth=2.0]; |
|
1753 11 -> 25 [arrowtail=dot, |
|
1754 dir=back, |
|
1755 minlen=0, |
|
1756 penwidth=2.0, |
|
1757 style=dashed]; |
|
1758 12 [fillcolor="#DFDFFF", |
|
1759 fixedsize=true, |
|
1760 group=fold_extinct, |
|
1761 height=1, |
|
1762 label="966df9f0", |
|
1763 pin=true, |
|
1764 pos="2,12!", |
|
1765 shape=circle, |
|
1766 style="dotted, filled", |
|
1767 width=1]; |
|
1768 11 -> 12 [penwidth=2.0]; |
|
1769 12 -> 25 [arrowtail=dot, |
|
1770 dir=back, |
|
1771 minlen=0, |
|
1772 penwidth=2.0, |
|
1773 style=dashed]; |
|
1774 } |
|
1775 |
|
1776 Split |
|
1777 ----- |
|
1778 |
|
1779 $ hg up split |
|
1780 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1781 |
|
1782 $ html_output $TESTDIR/output/split-before.log log -r "::split" -G |
|
1783 @ <span style="color:olive;">changeset: 13:5d5029b9daed</span> |
|
1784 | branch: split |
|
1785 | parent: 0:d2eb2ac6a5bd |
|
1786 | user: Boris Feld <boris.feld@octobus.net> |
|
1787 | date: Fri Dec 08 17:33:15 2017 +0100 |
|
1788 | summary: To be splitted |
|
1789 | |
|
1790 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1791 user: Boris Feld <boris.feld@octobus.net> |
|
1792 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1793 summary: ROOT |
|
1794 |
|
1795 $ graph $TESTDIR/graphs/split-before.dot -r "::split" -T "{shortest(node, 8)}" --public=yes |
|
1796 Wrote */graphs/split-before.dot (glob) |
|
1797 .. graphviz:: |
|
1798 |
|
1799 strict digraph "Mercurial graph" { |
|
1800 graph [rankdir=LR, |
|
1801 splines=polyline |
|
1802 ]; |
|
1803 node [label="\N"]; |
|
1804 0 [fillcolor="#7F7FFF", |
|
1805 fixedsize=true, |
|
1806 group=default, |
|
1807 height=1, |
|
1808 label=d2eb2ac6, |
|
1809 pin=true, |
|
1810 pos="1,0!", |
|
1811 shape=circle, |
|
1812 style=filled, |
|
1813 width=1]; |
|
1814 13 [fillcolor="#7F7FFF", |
|
1815 fixedsize=true, |
|
1816 group=split, |
|
1817 height=1, |
|
1818 label="5d5029b9", |
|
1819 pin=true, |
|
1820 pos="2,13!", |
|
1821 shape=circle, |
|
1822 style=filled, |
|
1823 width=1]; |
|
1824 0 -> 13 [penwidth=2.0]; |
|
1825 } |
|
1826 |
|
1827 |
|
1828 $ html_output $TESTDIR/output/split.log split -r .<< EOF |
|
1829 > Y |
|
1830 > N |
|
1831 > N |
|
1832 > N |
|
1833 > Y |
|
1834 > N |
|
1835 > N |
|
1836 > Y |
|
1837 > EOF |
|
1838 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
1839 adding src/A |
|
1840 adding src/B |
|
1841 adding src/C |
|
1842 <span style="font-weight:bold;">diff --git a/src/A b/src/A</span> |
|
1843 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
|
1844 <span style="color:olive;">examine changes to 'src/A'? [Ynesfdaq?]</span> Y |
|
1845 |
|
1846 <span style="font-weight:bold;">diff --git a/src/B b/src/B</span> |
|
1847 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
|
1848 <span style="color:olive;">examine changes to 'src/B'? [Ynesfdaq?]</span> N |
|
1849 |
|
1850 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
|
1851 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
|
1852 <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> N |
|
1853 |
|
1854 created new head |
|
1855 <span style="color:olive;">Done splitting? [yN]</span> N |
|
1856 <span style="font-weight:bold;">diff --git a/src/B b/src/B</span> |
|
1857 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
|
1858 <span style="color:olive;">examine changes to 'src/B'? [Ynesfdaq?]</span> Y |
|
1859 |
|
1860 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
|
1861 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
|
1862 <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> N |
|
1863 |
|
1864 <span style="color:olive;">Done splitting? [yN]</span> N |
|
1865 <span style="font-weight:bold;">diff --git a/src/C b/src/C</span> |
|
1866 <span style="color:teal;font-weight:bold;">new file mode 100644</span> |
|
1867 <span style="color:olive;">examine changes to 'src/C'? [Ynesfdaq?]</span> Y |
|
1868 |
|
1869 no more change to split |
|
1870 |
|
1871 $ html_output $TESTDIR/output/split-before-after.log log -r "::split" -G |
|
1872 @ <span style="color:olive;">changeset: 28:1b7281b1e052</span> |
|
1873 | branch: split |
|
1874 | tag: tip |
|
1875 | user: Boris Feld <boris.feld@octobus.net> |
|
1876 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1877 | summary: To be splitted |
|
1878 | |
|
1879 o <span style="color:olive;">changeset: 27:6fb7bfb44ffe</span> |
|
1880 | branch: split |
|
1881 | user: Boris Feld <boris.feld@octobus.net> |
|
1882 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1883 | summary: To be splitted |
|
1884 | |
|
1885 o <span style="color:olive;">changeset: 26:59f0ddc4bd4b</span> |
|
1886 | branch: split |
|
1887 | parent: 0:d2eb2ac6a5bd |
|
1888 | user: Boris Feld <boris.feld@octobus.net> |
|
1889 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1890 | summary: To be splitted |
|
1891 | |
|
1892 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
1893 user: Boris Feld <boris.feld@octobus.net> |
|
1894 date: Thu Dec 07 11:26:05 2017 +0100 |
|
1895 summary: ROOT |
|
1896 |
|
1897 $ graph $TESTDIR/graphs/split-before-after-hidden.dot -r "::branch(split)" -T "{shortest(node, 8)}" --hidden --public=yes |
|
1898 Wrote */graphs/split-before-after-hidden.dot (glob) |
|
1899 .. graphviz:: |
|
1900 |
|
1901 strict digraph "Mercurial graph" { |
|
1902 graph [rankdir=LR, |
|
1903 splines=polyline |
|
1904 ]; |
|
1905 node [label="\N"]; |
|
1906 0 [fillcolor="#7F7FFF", |
|
1907 fixedsize=true, |
|
1908 group=default, |
|
1909 height=1, |
|
1910 label=d2eb2ac6, |
|
1911 pin=true, |
|
1912 pos="1,0!", |
|
1913 shape=circle, |
|
1914 style=filled, |
|
1915 width=1]; |
|
1916 13 [fillcolor="#DFDFFF", |
|
1917 fixedsize=true, |
|
1918 group=split_extinct, |
|
1919 height=1, |
|
1920 label="5d5029b9", |
|
1921 pin=true, |
|
1922 pos="2,13!", |
|
1923 shape=circle, |
|
1924 style="dotted, filled", |
|
1925 width=1]; |
|
1926 0 -> 13 [penwidth=2.0]; |
|
1927 26 [fillcolor="#7F7FFF", |
|
1928 fixedsize=true, |
|
1929 group=split, |
|
1930 height=1, |
|
1931 label="59f0ddc4", |
|
1932 pin=true, |
|
1933 pos="3,26!", |
|
1934 shape=circle, |
|
1935 style=filled, |
|
1936 width=1]; |
|
1937 0 -> 26 [penwidth=2.0]; |
|
1938 13 -> 26 [arrowtail=dot, |
|
1939 dir=back, |
|
1940 minlen=0, |
|
1941 penwidth=2.0, |
|
1942 style=dashed]; |
|
1943 27 [fillcolor="#7F7FFF", |
|
1944 fixedsize=true, |
|
1945 group=split, |
|
1946 height=1, |
|
1947 label="6fb7bfb4", |
|
1948 pin=true, |
|
1949 pos="3,27!", |
|
1950 shape=circle, |
|
1951 style=filled, |
|
1952 width=1]; |
|
1953 13 -> 27 [arrowtail=dot, |
|
1954 dir=back, |
|
1955 minlen=0, |
|
1956 penwidth=2.0, |
|
1957 style=dashed]; |
|
1958 28 [fillcolor="#7F7FFF", |
|
1959 fixedsize=true, |
|
1960 group=split, |
|
1961 height=1, |
|
1962 label="1b7281b1", |
|
1963 pin=true, |
|
1964 pos="3,28!", |
|
1965 shape=circle, |
|
1966 style=filled, |
|
1967 width=1]; |
|
1968 13 -> 28 [arrowtail=dot, |
|
1969 dir=back, |
|
1970 minlen=0, |
|
1971 penwidth=2.0, |
|
1972 style=dashed]; |
|
1973 26 -> 27 [penwidth=2.0]; |
|
1974 27 -> 28 [penwidth=2.0]; |
|
1975 } |
|
1976 |
|
1977 $ html_output $TESTDIR/output/split-after-obslog.log obslog -r . |
|
1978 @ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted |
|
1979 | |
|
1980 x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted |
|
1981 rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1982 |
|
1983 $ html_output $TESTDIR/output/split-after-obslog-all.log obslog --all -r . |
|
1984 @ <span style="color:olive;">1b7281b1e052</span> <span style="color:blue;">(28)</span> To be splitted |
|
1985 | |
|
1986 | o <span style="color:olive;">59f0ddc4bd4b</span> <span style="color:blue;">(26)</span> To be splitted |
|
1987 |/ |
|
1988 | o <span style="color:olive;">6fb7bfb44ffe</span> <span style="color:blue;">(27)</span> To be splitted |
|
1989 |/ |
|
1990 x <span style="color:olive;">5d5029b9daed</span> <span style="color:blue;">(13)</span> To be splitted |
|
1991 rewritten(date, parent, content) as <span style="color:olive;">1b7281b1e052, 59f0ddc4bd4b, 6fb7bfb44ffe</span> by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
1992 |
|
1993 $ html_output $TESTDIR/output/split-after-log-phase.log log -G -r "::split" --template "{rev} {phase}\n" |
|
1994 @ 28 draft |
|
1995 | |
|
1996 o 27 draft |
|
1997 | |
|
1998 o 26 draft |
|
1999 | |
|
2000 o 0 public |
|
2001 |
|
2002 |
|
2003 $ html_output $TESTDIR/output/split-after-phase.log phase -r "::split" |
|
2004 0: public |
|
2005 26: draft |
|
2006 27: draft |
|
2007 28: draft |
|
2008 |
|
2009 Prune |
|
2010 ----- |
|
2011 |
|
2012 $ hg update prune |
|
2013 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
2014 |
|
2015 |
|
2016 $ html_output $TESTDIR/output/prune-before.log log -G -r "::prune" |
|
2017 @ <span style="color:olive;">changeset: 9:324b72ebbb21</span> |
|
2018 | branch: prune |
|
2019 | parent: 0:d2eb2ac6a5bd |
|
2020 | user: Boris Feld <boris.feld@octobus.net> |
|
2021 | date: Fri Dec 08 16:12:23 2017 +0100 |
|
2022 | summary: Commit to prune |
|
2023 | |
|
2024 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
2025 user: Boris Feld <boris.feld@octobus.net> |
|
2026 date: Thu Dec 07 11:26:05 2017 +0100 |
|
2027 summary: ROOT |
|
2028 |
|
2029 $ graph $TESTDIR/graphs/prune-before.dot -r '::prune' -T "{shortest(node, 8)}" --public=yes |
|
2030 Wrote */graphs/prune-before.dot (glob) |
|
2031 .. graphviz:: |
|
2032 |
|
2033 strict digraph "Mercurial graph" { |
|
2034 graph [rankdir=LR, |
|
2035 splines=polyline |
|
2036 ]; |
|
2037 node [label="\N"]; |
|
2038 0 [fillcolor="#7F7FFF", |
|
2039 fixedsize=true, |
|
2040 group=default, |
|
2041 height=1, |
|
2042 label=d2eb2ac6, |
|
2043 pin=true, |
|
2044 pos="1,0!", |
|
2045 shape=circle, |
|
2046 style=filled, |
|
2047 width=1]; |
|
2048 9 [fillcolor="#7F7FFF", |
|
2049 fixedsize=true, |
|
2050 group=prune, |
|
2051 height=1, |
|
2052 label="324b72eb", |
|
2053 pin=true, |
|
2054 pos="2,9!", |
|
2055 shape=circle, |
|
2056 style=filled, |
|
2057 width=1]; |
|
2058 0 -> 9 [penwidth=2.0]; |
|
2059 } |
|
2060 |
|
2061 $ html_output $TESTDIR/output/prune.log prune -r . |
|
2062 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2063 working directory now at <span style="color:olive;">d2eb2ac6a5bd</span> |
|
2064 1 changesets pruned |
|
2065 |
|
2066 $ html_output $TESTDIR/output/prune-after.log log -G -r "::prune" |
|
2067 abort: unknown revision 'prune'! |
|
2068 |
|
2069 $ html_output $TESTDIR/output/prune-after-hidden.log log -G -r "::prune" --hidden |
|
2070 x <span style="color:olive;">changeset: 9:324b72ebbb21</span> |
|
2071 | branch: prune |
|
2072 | parent: 0:d2eb2ac6a5bd |
|
2073 | user: Boris Feld <boris.feld@octobus.net> |
|
2074 | date: Fri Dec 08 16:12:23 2017 +0100 |
|
2075 | obsolete: pruned |
|
2076 | summary: Commit to prune |
|
2077 | |
|
2078 @ <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
2079 user: Boris Feld <boris.feld@octobus.net> |
|
2080 date: Thu Dec 07 11:26:05 2017 +0100 |
|
2081 summary: ROOT |
|
2082 |
|
2083 |
|
2084 $ html_output $TESTDIR/output/prune-after-obslog.log obslog -r "prune" --hidden |
|
2085 x <span style="color:olive;">324b72ebbb21</span> <span style="color:blue;">(9)</span> Commit to prune |
|
2086 pruned by <span style="color:green;">test</span> <span style="color:teal;">(Thu Jan 01 00:00:00 1970 +0000)</span> |
|
2087 |
|
2088 $ graph $TESTDIR/graphs/prune-after-hidden.dot -r '::prune' -T "{shortest(node, 8)}" --hidden --public=yes |
|
2089 Wrote */graphs/prune-after-hidden.dot (glob) |
|
2090 .. graphviz:: |
|
2091 |
|
2092 strict digraph "Mercurial graph" { |
|
2093 graph [rankdir=LR, |
|
2094 splines=polyline |
|
2095 ]; |
|
2096 node [label="\N"]; |
|
2097 0 [fillcolor="#7F7FFF", |
|
2098 fixedsize=true, |
|
2099 group=default, |
|
2100 height=1, |
|
2101 label=d2eb2ac6, |
|
2102 pin=true, |
|
2103 pos="1,0!", |
|
2104 shape=circle, |
|
2105 style=filled, |
|
2106 width=1]; |
|
2107 9 [fillcolor="#DFDFFF", |
|
2108 fixedsize=true, |
|
2109 group=prune_extinct, |
|
2110 height=1, |
|
2111 label="324b72eb", |
|
2112 pin=true, |
|
2113 pos="2,9!", |
|
2114 shape=circle, |
|
2115 style="dotted, filled", |
|
2116 width=1]; |
|
2117 0 -> 9 [penwidth=2.0]; |
|
2118 } |
|
2119 |
|
2120 Histedit |
|
2121 -------- |
|
2122 |
|
2123 $ hg up histedit |
|
2124 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2125 |
|
2126 $ html_output $TESTDIR/output/histedit-before-log.log log -G -r "::histedit" |
|
2127 @ <span style="color:olive;">changeset: 16:1b1e58a9ed27</span> |
|
2128 | branch: histedit |
|
2129 | user: Boris Feld <boris.feld@octobus.net> |
|
2130 | date: Sat Dec 09 17:37:15 2017 +0100 |
|
2131 | summary: Add test for myfeature |
|
2132 | |
|
2133 o <span style="color:olive;">changeset: 15:23eb6f9e4c51</span> |
|
2134 | branch: histedit |
|
2135 | user: Boris Feld <boris.feld@octobus.net> |
|
2136 | date: Sat Dec 09 17:35:15 2017 +0100 |
|
2137 | summary: Add code for myfeature |
|
2138 | |
|
2139 o <span style="color:olive;">changeset: 14:d102c718e607</span> |
|
2140 | branch: histedit |
|
2141 | parent: 0:d2eb2ac6a5bd |
|
2142 | user: Boris Feld <boris.feld@octobus.net> |
|
2143 | date: Sat Dec 09 17:33:15 2017 +0100 |
|
2144 | summary: First commit on histedit branch |
|
2145 | |
|
2146 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
2147 user: Boris Feld <boris.feld@octobus.net> |
|
2148 date: Thu Dec 07 11:26:05 2017 +0100 |
|
2149 summary: ROOT |
|
2150 |
|
2151 $ graph $TESTDIR/graphs/histedit-before.dot -r "::histedit" -T "{shortest(node, 8)}" --public=yes |
|
2152 Wrote */graphs/histedit-before.dot (glob) |
|
2153 .. graphviz:: |
|
2154 |
|
2155 strict digraph "Mercurial graph" { |
|
2156 graph [rankdir=LR, |
|
2157 splines=polyline |
|
2158 ]; |
|
2159 node [label="\N"]; |
|
2160 0 [fillcolor="#7F7FFF", |
|
2161 fixedsize=true, |
|
2162 group=default, |
|
2163 height=1, |
|
2164 label=d2eb2ac6, |
|
2165 pin=true, |
|
2166 pos="1,0!", |
|
2167 shape=circle, |
|
2168 style=filled, |
|
2169 width=1]; |
|
2170 14 [fillcolor="#7F7FFF", |
|
2171 fixedsize=true, |
|
2172 group=histedit, |
|
2173 height=1, |
|
2174 label=d102c718, |
|
2175 pin=true, |
|
2176 pos="2,14!", |
|
2177 shape=circle, |
|
2178 style=filled, |
|
2179 width=1]; |
|
2180 0 -> 14 [penwidth=2.0]; |
|
2181 15 [fillcolor="#7F7FFF", |
|
2182 fixedsize=true, |
|
2183 group=histedit, |
|
2184 height=1, |
|
2185 label="23eb6f9e", |
|
2186 pin=true, |
|
2187 pos="2,15!", |
|
2188 shape=circle, |
|
2189 style=filled, |
|
2190 width=1]; |
|
2191 14 -> 15 [penwidth=2.0]; |
|
2192 16 [fillcolor="#7F7FFF", |
|
2193 fixedsize=true, |
|
2194 group=histedit, |
|
2195 height=1, |
|
2196 label="1b1e58a9", |
|
2197 pin=true, |
|
2198 pos="2,16!", |
|
2199 shape=circle, |
|
2200 style=filled, |
|
2201 width=1]; |
|
2202 15 -> 16 [penwidth=2.0]; |
|
2203 } |
|
2204 |
|
2205 $ HGEDITOR=cat html_output $TESTDIR/output/histedit-no-edit.log histedit -r ".~1" |
|
2206 pick 23eb6f9e4c51 15 Add code for myfeature |
|
2207 pick 1b1e58a9ed27 16 Add test for myfeature |
|
2208 |
|
2209 # Edit history between 23eb6f9e4c51 and 1b1e58a9ed27 |
|
2210 # |
|
2211 # Commits are listed from least to most recent |
|
2212 # |
|
2213 # You can reorder changesets by reordering the lines |
|
2214 # |
|
2215 # Commands: |
|
2216 # |
|
2217 # e, edit = use commit, but stop for amending |
|
2218 # m, mess = edit commit message without changing commit content |
|
2219 # p, pick = use commit |
|
2220 # b, base = checkout changeset and apply further changesets from there |
|
2221 # d, drop = remove commit from history |
|
2222 # f, fold = use commit, but combine it with the one above |
|
2223 # r, roll = like fold, but discard this commit's description and date |
|
2224 # |
|
2225 |
|
2226 Format the commands the best way we can |
|
2227 |
|
2228 $ HGEDITOR=cat hg histedit -r ".~1" | head -n 2 | tail -n 1 > commands |
|
2229 $ HGEDITOR=cat hg histedit -r ".~1" | head -n 1 >> commands |
|
2230 |
|
2231 $ html_raw_output $TESTDIR/output/histedit-commands.log cat commands |
|
2232 pick 1b1e58a9ed27 16 Add test for myfeature |
|
2233 pick 23eb6f9e4c51 15 Add code for myfeature |
|
2234 |
|
2235 $ HGEDITOR=cat html_output $TESTDIR/output/histedit.log histedit -r ".~1" --commands commands |
|
2236 |
|
2237 $ html_output $TESTDIR/output/histedit-after-log.log log -G -r ""::histedit"" |
|
2238 @ <span style="color:olive;">changeset: 30:27cb89067c43</span> |
|
2239 | branch: histedit |
|
2240 | tag: tip |
|
2241 | user: Boris Feld <boris.feld@octobus.net> |
|
2242 | date: Sat Dec 09 17:35:15 2017 +0100 |
|
2243 | summary: Add code for myfeature |
|
2244 | |
|
2245 o <span style="color:olive;">changeset: 29:a2082e406c4f</span> |
|
2246 | branch: histedit |
|
2247 | parent: 14:d102c718e607 |
|
2248 | user: Boris Feld <boris.feld@octobus.net> |
|
2249 | date: Sat Dec 09 17:37:15 2017 +0100 |
|
2250 | summary: Add test for myfeature |
|
2251 | |
|
2252 o <span style="color:olive;">changeset: 14:d102c718e607</span> |
|
2253 | branch: histedit |
|
2254 | parent: 0:d2eb2ac6a5bd |
|
2255 | user: Boris Feld <boris.feld@octobus.net> |
|
2256 | date: Sat Dec 09 17:33:15 2017 +0100 |
|
2257 | summary: First commit on histedit branch |
|
2258 | |
|
2259 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
2260 user: Boris Feld <boris.feld@octobus.net> |
|
2261 date: Thu Dec 07 11:26:05 2017 +0100 |
|
2262 summary: ROOT |
|
2263 |
|
2264 |
|
2265 $ html_output $TESTDIR/output/histedit-after-log-hidden.log log -G -r "::branch(histedit)" --hidden |
|
2266 @ <span style="color:olive;">changeset: 30:27cb89067c43</span> |
|
2267 | branch: histedit |
|
2268 | tag: tip |
|
2269 | user: Boris Feld <boris.feld@octobus.net> |
|
2270 | date: Sat Dec 09 17:35:15 2017 +0100 |
|
2271 | summary: Add code for myfeature |
|
2272 | |
|
2273 o <span style="color:olive;">changeset: 29:a2082e406c4f</span> |
|
2274 | branch: histedit |
|
2275 | parent: 14:d102c718e607 |
|
2276 | user: Boris Feld <boris.feld@octobus.net> |
|
2277 | date: Sat Dec 09 17:37:15 2017 +0100 |
|
2278 | summary: Add test for myfeature |
|
2279 | |
|
2280 | x <span style="color:olive;">changeset: 16:1b1e58a9ed27</span> |
|
2281 | | branch: histedit |
|
2282 | | user: Boris Feld <boris.feld@octobus.net> |
|
2283 | | date: Sat Dec 09 17:37:15 2017 +0100 |
|
2284 | | obsolete: rebased using histedit as 29:a2082e406c4f |
|
2285 | | summary: Add test for myfeature |
|
2286 | | |
|
2287 | x <span style="color:olive;">changeset: 15:23eb6f9e4c51</span> |
|
2288 |/ branch: histedit |
|
2289 | user: Boris Feld <boris.feld@octobus.net> |
|
2290 | date: Sat Dec 09 17:35:15 2017 +0100 |
|
2291 | obsolete: rebased using histedit as 30:27cb89067c43 |
|
2292 | summary: Add code for myfeature |
|
2293 | |
|
2294 o <span style="color:olive;">changeset: 14:d102c718e607</span> |
|
2295 | branch: histedit |
|
2296 | parent: 0:d2eb2ac6a5bd |
|
2297 | user: Boris Feld <boris.feld@octobus.net> |
|
2298 | date: Sat Dec 09 17:33:15 2017 +0100 |
|
2299 | summary: First commit on histedit branch |
|
2300 | |
|
2301 o <span style="color:olive;">changeset: 0:d2eb2ac6a5bd</span> |
|
2302 user: Boris Feld <boris.feld@octobus.net> |
|
2303 date: Thu Dec 07 11:26:05 2017 +0100 |
|
2304 summary: ROOT |
|
2305 |
|
2306 |
|
2307 $ graph $TESTDIR/graphs/histedit-after-hidden.dot -r "::branch(histedit)" -T "{shortest(node, 8)}" --public=yes --hidden |
|
2308 Wrote */graphs/histedit-after-hidden.dot (glob) |
|
2309 .. graphviz:: |
|
2310 |
|
2311 strict digraph "Mercurial graph" { |
|
2312 graph [rankdir=LR, |
|
2313 splines=polyline |
|
2314 ]; |
|
2315 node [label="\N"]; |
|
2316 0 [fillcolor="#7F7FFF", |
|
2317 fixedsize=true, |
|
2318 group=default, |
|
2319 height=1, |
|
2320 label=d2eb2ac6, |
|
2321 pin=true, |
|
2322 pos="1,0!", |
|
2323 shape=circle, |
|
2324 style=filled, |
|
2325 width=1]; |
|
2326 14 [fillcolor="#7F7FFF", |
|
2327 fixedsize=true, |
|
2328 group=histedit, |
|
2329 height=1, |
|
2330 label=d102c718, |
|
2331 pin=true, |
|
2332 pos="2,14!", |
|
2333 shape=circle, |
|
2334 style=filled, |
|
2335 width=1]; |
|
2336 0 -> 14 [penwidth=2.0]; |
|
2337 15 [fillcolor="#DFDFFF", |
|
2338 fixedsize=true, |
|
2339 group=histedit_extinct, |
|
2340 height=1, |
|
2341 label="23eb6f9e", |
|
2342 pin=true, |
|
2343 pos="3,15!", |
|
2344 shape=circle, |
|
2345 style="dotted, filled", |
|
2346 width=1]; |
|
2347 14 -> 15 [penwidth=2.0]; |
|
2348 29 [fillcolor="#7F7FFF", |
|
2349 fixedsize=true, |
|
2350 group=histedit, |
|
2351 height=1, |
|
2352 label=a2082e40, |
|
2353 pin=true, |
|
2354 pos="2,29!", |
|
2355 shape=circle, |
|
2356 style=filled, |
|
2357 width=1]; |
|
2358 14 -> 29 [penwidth=2.0]; |
|
2359 30 [fillcolor="#7F7FFF", |
|
2360 fixedsize=true, |
|
2361 group=histedit, |
|
2362 height=1, |
|
2363 label="27cb8906", |
|
2364 pin=true, |
|
2365 pos="2,30!", |
|
2366 shape=circle, |
|
2367 style=filled, |
|
2368 width=1]; |
|
2369 15 -> 30 [arrowtail=dot, |
|
2370 dir=back, |
|
2371 minlen=0, |
|
2372 penwidth=2.0, |
|
2373 style=dashed]; |
|
2374 16 [fillcolor="#DFDFFF", |
|
2375 fixedsize=true, |
|
2376 group=histedit_extinct, |
|
2377 height=1, |
|
2378 label="1b1e58a9", |
|
2379 pin=true, |
|
2380 pos="3,16!", |
|
2381 shape=circle, |
|
2382 style="dotted, filled", |
|
2383 width=1]; |
|
2384 15 -> 16 [penwidth=2.0]; |
|
2385 16 -> 29 [arrowtail=dot, |
|
2386 dir=back, |
|
2387 minlen=0, |
|
2388 penwidth=2.0, |
|
2389 style=dashed]; |
|
2390 29 -> 30 [penwidth=2.0]; |
|
2391 } |
|
2392 |
|
2393 Stack |
|
2394 ----- |
|
2395 |
|
2396 $ hg update typo |
|
2397 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2398 |
|
2399 $ html_output $TESTDIR/output/stack-typo.log stack |
|
2400 ### target: typo (branch) |
|
2401 <span style="color:teal;">b1</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Fix bug</span><span style="color:teal;font-weight:bold;"> (current)</span> |
|
2402 b0^ ROOT (base) |
|
2403 |
|
2404 $ hg update build/linuxsupport-v2 |
|
2405 4 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2406 |
|
2407 $ html_output $TESTDIR/output/stack-rebase.log stack |
|
2408 ### target: build/linuxsupport-v2 (branch) |
|
2409 <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
|
2410 <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2. |
|
2411 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
|
2412 b0^ New commit on build/v2 (base) |
|
2413 |
|
2414 $ html_output $TESTDIR/output/stack-rebase-prev-from-b3.log prev |
|
2415 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2416 [<span style="color:blue;">19</span>] Second commit on build/linuxsupport-v2. |
|
2417 |
|
2418 $ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack |
|
2419 ### target: build/linuxsupport-v2 (branch) |
|
2420 <span style="color:olive;">b3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2 |
|
2421 <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="color:teal;font-weight:bold;"> (current)</span> |
|
2422 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
|
2423 b0^ New commit on build/v2 (base) |
|
2424 |
|
2425 $ html_output $TESTDIR/output/stack-rebase-next-from-b2.log next |
|
2426 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2427 [<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2 |
|
2428 |
|
2429 $ html_output $TESTDIR/output/stack-rebase-export-b1.log export -r b1 |
|
2430 # HG changeset patch |
|
2431 # User Boris Feld <boris.feld@octobus.net> |
|
2432 # Date 1512661592 -3600 |
|
2433 # Thu Dec 07 16:46:32 2017 +0100 |
|
2434 # Branch build/linuxsupport-v2 |
|
2435 # Node ID 7b62ce2c283e6fa23af1811efea529c30620196a |
|
2436 # Parent 0e694460372ee8e9ca759c90f05a31f11eee34ac |
|
2437 First commit on build/linuxsupport-v2 |
|
2438 |
|
2439 $ html_output $TESTDIR/output/stack-rebase-update-b2.log update -r b2 |
|
2440 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2441 |
|
2442 $ html_output $TESTDIR/output/stack-rebase-stack-b2.log stack |
|
2443 ### target: build/linuxsupport-v2 (branch) |
|
2444 <span style="color:olive;">b3</span><span style="color:green;">:</span> Third commit on build/linuxsupport-v2 |
|
2445 <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2.</span><span style="color:teal;font-weight:bold;"> (current)</span> |
|
2446 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
|
2447 b0^ New commit on build/v2 (base) |
|
2448 |
|
2449 |
|
2450 Edit mid-stack |
|
2451 -------------- |
|
2452 |
|
2453 $ html_output $TESTDIR/output/edit-mid-stack.log amend -m "Second commit on build/linuxsupport-v2" |
|
2454 1 new orphan changesets |
|
2455 |
|
2456 $ html_output $TESTDIR/output/edit-mid-stack-after-stack.log stack |
|
2457 ### target: build/linuxsupport-v2 (branch) |
|
2458 <span style="color:olive;">b3</span><span style="color:red;">$</span> Third commit on build/linuxsupport-v2<span style="color:red;"> (unstable)</span> |
|
2459 <span style="color:teal;">b2</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Second commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
|
2460 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
|
2461 b0^ New commit on build/v2 (base) |
|
2462 |
|
2463 $ html_output $TESTDIR/output/edit-mid-stack-after-log.log log -r "branch(build/linuxsupport-v2)" -G |
|
2464 @ <span style="color:olive;">changeset: 31:5c069dd03e05</span> |
|
2465 | branch: build/linuxsupport-v2 |
|
2466 | tag: tip |
|
2467 | parent: 18:7b62ce2c283e |
|
2468 | user: Boris Feld <boris.feld@octobus.net> |
|
2469 | date: Mon Dec 11 11:20:24 2017 +0100 |
|
2470 | summary: Second commit on build/linuxsupport-v2 |
|
2471 | |
|
2472 | o <span style="color:olive;">changeset: 20:3d2c8a2356a2</span> |
|
2473 | | branch: build/linuxsupport-v2 |
|
2474 | | user: Boris Feld <boris.feld@octobus.net> |
|
2475 | | date: Mon Dec 11 11:21:02 2017 +0100 |
|
2476 | | instability: orphan |
|
2477 | | summary: Third commit on build/linuxsupport-v2 |
|
2478 | | |
|
2479 | x <span style="color:olive;">changeset: 19:4686378320d7</span> |
|
2480 |/ branch: build/linuxsupport-v2 |
|
2481 | user: Boris Feld <boris.feld@octobus.net> |
|
2482 | date: Mon Dec 11 11:20:24 2017 +0100 |
|
2483 | obsolete: reworded using amend as 31:5c069dd03e05 |
|
2484 | summary: Second commit on build/linuxsupport-v2. |
|
2485 | |
|
2486 o <span style="color:olive;">changeset: 18:7b62ce2c283e</span> |
|
2487 | branch: build/linuxsupport-v2 |
|
2488 ~ parent: 6:0e694460372e |
|
2489 user: Boris Feld <boris.feld@octobus.net> |
|
2490 date: Thu Dec 07 16:46:32 2017 +0100 |
|
2491 summary: First commit on build/linuxsupport-v2 |
|
2492 |
|
2493 |
|
2494 $ graph $TESTDIR/graphs/edit-mid-stack-after.dot -r "branch(build/linuxsupport-v2)" -T "{shortest(node, 8)}" --public=yes |
|
2495 Wrote */graphs/edit-mid-stack-after.dot (glob) |
|
2496 .. graphviz:: |
|
2497 |
|
2498 strict digraph "Mercurial graph" { |
|
2499 graph [rankdir=LR, |
|
2500 splines=polyline |
|
2501 ]; |
|
2502 node [label="\N"]; |
|
2503 18 [fillcolor="#7F7FFF", |
|
2504 fixedsize=true, |
|
2505 group="build/linuxsupport-v2", |
|
2506 height=1, |
|
2507 label="7b62ce2c", |
|
2508 pin=true, |
|
2509 pos="1,18!", |
|
2510 shape=circle, |
|
2511 style=filled, |
|
2512 width=1]; |
|
2513 19 [fillcolor="#DFDFFF", |
|
2514 fixedsize=true, |
|
2515 group="build/linuxsupport-v2_alt", |
|
2516 height=1, |
|
2517 label=46863783, |
|
2518 pin=true, |
|
2519 pos="2,19!", |
|
2520 shape=circle, |
|
2521 style="dotted, filled", |
|
2522 width=1]; |
|
2523 18 -> 19 [penwidth=2.0]; |
|
2524 31 [fillcolor="#7F7FFF", |
|
2525 fixedsize=true, |
|
2526 group="build/linuxsupport-v2", |
|
2527 height=1, |
|
2528 label="5c069dd0", |
|
2529 pin=true, |
|
2530 pos="1,31!", |
|
2531 shape=circle, |
|
2532 style=filled, |
|
2533 width=1]; |
|
2534 18 -> 31 [penwidth=2.0]; |
|
2535 19 -> 31 [arrowtail=dot, |
|
2536 dir=back, |
|
2537 minlen=0, |
|
2538 penwidth=2.0, |
|
2539 style=dashed]; |
|
2540 20 [fillcolor="#FF4F4F", |
|
2541 fixedsize=true, |
|
2542 group="build/linuxsupport-v2_alt", |
|
2543 height=1, |
|
2544 label="3d2c8a23", |
|
2545 pin=true, |
|
2546 pos="2,20!", |
|
2547 shape=circle, |
|
2548 style=filled, |
|
2549 width=1]; |
|
2550 19 -> 20 [penwidth=2.0]; |
|
2551 } |
|
2552 |
|
2553 Basic troubles + stabilization |
|
2554 ------------------------------ |
|
2555 |
|
2556 $ cp -R $TESTTMP/evolve_training_repo $TESTDIR/base-repos/edit-mid-stack/ |
|
2557 |
|
2558 $ html_output $TESTDIR/output/basic-stabilize-before-log-obsolete.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {obsolete}\n" |
|
2559 @ 5c069dd03e05: |
|
2560 | |
|
2561 | o 3d2c8a2356a2: |
|
2562 | | |
|
2563 | x 4686378320d7: obsolete |
|
2564 |/ |
|
2565 o 7b62ce2c283e: |
|
2566 | |
|
2567 ~ |
|
2568 |
|
2569 $ html_output $TESTDIR/output/basic-stabilize-before-log-instabilities.log log -r "branch(build/linuxsupport-v2)" -G -T "{node|short}: {instabilities}\n" |
|
2570 @ 5c069dd03e05: |
|
2571 | |
|
2572 | o 3d2c8a2356a2: orphan |
|
2573 | | |
|
2574 | x 4686378320d7: |
|
2575 |/ |
|
2576 o 7b62ce2c283e: |
|
2577 | |
|
2578 ~ |
|
2579 |
|
2580 $ html_output $TESTDIR/output/basic-stabilize-before-evolve-list.log evolve --list |
|
2581 3d2c8a2356a2: Third commit on build/linuxsupport-v2 |
|
2582 unstable: 4686378320d7 (obsolete parent) |
|
2583 |
|
2584 $ html_output $TESTDIR/output/basic-stabilize-next-evolve.log next --evolve |
|
2585 move:[<span style="color:blue;">20</span>] Third commit on build/linuxsupport-v2 |
|
2586 atop:[<span style="color:blue;">31</span>] Second commit on build/linuxsupport-v2 |
|
2587 working directory now at <span style="color:olive;">52e790f9d4c3</span> |
|
2588 |
|
2589 $ html_output $TESTDIR/output/basic-stabilize-after-stack.log stack |
|
2590 ### target: build/linuxsupport-v2 (branch) |
|
2591 <span style="color:teal;">b3</span><span style="color:teal;font-weight:bold;">@</span> <span style="color:teal;">Third commit on build/linuxsupport-v2</span><span style="color:teal;font-weight:bold;"> (current)</span> |
|
2592 <span style="color:olive;">b2</span><span style="color:green;">:</span> Second commit on build/linuxsupport-v2 |
|
2593 <span style="color:olive;">b1</span><span style="color:green;">:</span> First commit on build/linuxsupport-v2 |
|
2594 b0^ New commit on build/v2 (base) |
|
2595 |
|
2596 $ graph $TESTDIR/graphs/basic-stabilize-after-stack.dot -T "{shortest(node, 8)}" -r "(::. + ::precursors(.)) and branch(build/linuxsupport-v2)" --hidden --public=yes |
|
2597 Wrote */graphs/basic-stabilize-after-stack.dot (glob) |
|
2598 .. graphviz:: |
|
2599 |
|
2600 strict digraph "Mercurial graph" { |
|
2601 graph [rankdir=LR, |
|
2602 splines=polyline |
|
2603 ]; |
|
2604 node [label="\N"]; |
|
2605 18 [fillcolor="#7F7FFF", |
|
2606 fixedsize=true, |
|
2607 group="build/linuxsupport-v2", |
|
2608 height=1, |
|
2609 label="7b62ce2c", |
|
2610 pin=true, |
|
2611 pos="1,18!", |
|
2612 shape=circle, |
|
2613 style=filled, |
|
2614 width=1]; |
|
2615 31 [fillcolor="#7F7FFF", |
|
2616 fixedsize=true, |
|
2617 group="build/linuxsupport-v2", |
|
2618 height=1, |
|
2619 label="5c069dd0", |
|
2620 pin=true, |
|
2621 pos="1,31!", |
|
2622 shape=circle, |
|
2623 style=filled, |
|
2624 width=1]; |
|
2625 18 -> 31 [penwidth=2.0]; |
|
2626 19 [fillcolor="#DFDFFF", |
|
2627 fixedsize=true, |
|
2628 group="build/linuxsupport-v2_extinct", |
|
2629 height=1, |
|
2630 label=46863783, |
|
2631 pin=true, |
|
2632 pos="2,19!", |
|
2633 shape=circle, |
|
2634 style="dotted, filled", |
|
2635 width=1]; |
|
2636 18 -> 19 [penwidth=2.0]; |
|
2637 32 [fillcolor="#7F7FFF", |
|
2638 fixedsize=true, |
|
2639 group="build/linuxsupport-v2", |
|
2640 height=1, |
|
2641 label="52e790f9", |
|
2642 pin=true, |
|
2643 pos="1,32!", |
|
2644 shape=circle, |
|
2645 style=filled, |
|
2646 width=1]; |
|
2647 31 -> 32 [penwidth=2.0]; |
|
2648 19 -> 31 [arrowtail=dot, |
|
2649 dir=back, |
|
2650 minlen=0, |
|
2651 penwidth=2.0, |
|
2652 style=dashed]; |
|
2653 20 [fillcolor="#DFDFFF", |
|
2654 fixedsize=true, |
|
2655 group="build/linuxsupport-v2_extinct", |
|
2656 height=1, |
|
2657 label="3d2c8a23", |
|
2658 pin=true, |
|
2659 pos="2,20!", |
|
2660 shape=circle, |
|
2661 style="dotted, filled", |
|
2662 width=1]; |
|
2663 19 -> 20 [penwidth=2.0]; |
|
2664 20 -> 32 [arrowtail=dot, |
|
2665 dir=back, |
|
2666 minlen=0, |
|
2667 penwidth=2.0, |
|
2668 style=dashed]; |
|
2669 } |
|
2670 Basic exchange |
|
2671 -------------- |
|
2672 |
|
2673 $ html_output $TESTDIR/output/basic-exchange-clone.log clone . ../evolve_training_repo_server/ |
|
2674 updating to branch default |
|
2675 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2676 |
|
2677 $ cd ../evolve_training_repo_server |
|
2678 |
|
2679 $ hg log -G |
|
2680 o changeset: 32:52e790f9d4c3 |
|
2681 | branch: build/linuxsupport-v2 |
|
2682 | tag: tip |
|
2683 | user: Boris Feld <boris.feld@octobus.net> |
|
2684 | date: Mon Dec 11 11:21:02 2017 +0100 |
|
2685 | summary: Third commit on build/linuxsupport-v2 |
|
2686 | |
|
2687 o changeset: 31:5c069dd03e05 |
|
2688 | branch: build/linuxsupport-v2 |
|
2689 | parent: 18:7b62ce2c283e |
|
2690 | user: Boris Feld <boris.feld@octobus.net> |
|
2691 | date: Mon Dec 11 11:20:24 2017 +0100 |
|
2692 | summary: Second commit on build/linuxsupport-v2 |
|
2693 | |
|
2694 | o changeset: 30:27cb89067c43 |
|
2695 | | branch: histedit |
|
2696 | | user: Boris Feld <boris.feld@octobus.net> |
|
2697 | | date: Sat Dec 09 17:35:15 2017 +0100 |
|
2698 | | summary: Add code for myfeature |
|
2699 | | |
|
2700 | o changeset: 29:a2082e406c4f |
|
2701 | | branch: histedit |
|
2702 | | parent: 14:d102c718e607 |
|
2703 | | user: Boris Feld <boris.feld@octobus.net> |
|
2704 | | date: Sat Dec 09 17:37:15 2017 +0100 |
|
2705 | | summary: Add test for myfeature |
|
2706 | | |
|
2707 | | o changeset: 28:1b7281b1e052 |
|
2708 | | | branch: split |
|
2709 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2710 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2711 | | | summary: To be splitted |
|
2712 | | | |
|
2713 | | o changeset: 27:6fb7bfb44ffe |
|
2714 | | | branch: split |
|
2715 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2716 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2717 | | | summary: To be splitted |
|
2718 | | | |
|
2719 | | o changeset: 26:59f0ddc4bd4b |
|
2720 | | | branch: split |
|
2721 | | | parent: 0:d2eb2ac6a5bd |
|
2722 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2723 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2724 | | | summary: To be splitted |
|
2725 | | | |
|
2726 | | | o changeset: 25:dab6ed4b3c75 |
|
2727 | | |/ branch: fold |
|
2728 | | | parent: 0:d2eb2ac6a5bd |
|
2729 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2730 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2731 | | | summary: add a test |
|
2732 | | | |
|
2733 | | | o changeset: 24:76ace846a3f9 |
|
2734 | | | | branch: amend-extract |
|
2735 | | | | parent: 7:4ae0d1de7a58 |
|
2736 | | | | user: Good User |
|
2737 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
|
2738 | | | | summary: Commit to be extracted |
|
2739 | | | | |
|
2740 o | | | changeset: 18:7b62ce2c283e |
|
2741 | | | | branch: build/linuxsupport-v2 |
|
2742 | | | | parent: 6:0e694460372e |
|
2743 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2744 | | | | date: Thu Dec 07 16:46:32 2017 +0100 |
|
2745 | | | | summary: First commit on build/linuxsupport-v2 |
|
2746 | | | | |
|
2747 | | +---o changeset: 17:708369dc1bfe |
|
2748 | | | | branch: typo |
|
2749 | | | | parent: 0:d2eb2ac6a5bd |
|
2750 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2751 | | | | date: Thu Dec 07 11:26:53 2017 +0100 |
|
2752 | | | | summary: Fix bug |
|
2753 | | | | |
|
2754 | o | | changeset: 14:d102c718e607 |
|
2755 | |/ / branch: histedit |
|
2756 | | | parent: 0:d2eb2ac6a5bd |
|
2757 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2758 | | | date: Sat Dec 09 17:33:15 2017 +0100 |
|
2759 | | | summary: First commit on histedit branch |
|
2760 | | | |
|
2761 | | o changeset: 7:4ae0d1de7a58 |
|
2762 | |/ branch: amend-extract |
|
2763 | | parent: 0:d2eb2ac6a5bd |
|
2764 | | user: Boris Feld <boris.feld@octobus.net> |
|
2765 | | date: Fri Dec 08 15:04:09 2017 +0100 |
|
2766 | | summary: Base file |
|
2767 | | |
|
2768 o | changeset: 6:0e694460372e |
|
2769 | | branch: build/v2 |
|
2770 | | parent: 2:f3bd0ab4ee87 |
|
2771 | | user: Boris Feld <boris.feld@octobus.net> |
|
2772 | | date: Mon Dec 11 11:22:16 2017 +0100 |
|
2773 | | summary: New commit on build/v2 |
|
2774 | | |
|
2775 o | changeset: 2:f3bd0ab4ee87 |
|
2776 |/ branch: build/v2 |
|
2777 | parent: 0:d2eb2ac6a5bd |
|
2778 | user: Boris Feld <boris.feld@octobus.net> |
|
2779 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
2780 | summary: First commit on build/v2 |
|
2781 | |
|
2782 @ changeset: 0:d2eb2ac6a5bd |
|
2783 user: Boris Feld <boris.feld@octobus.net> |
|
2784 date: Thu Dec 07 11:26:05 2017 +0100 |
|
2785 summary: ROOT |
|
2786 |
|
2787 |
|
2788 |
|
2789 FINAL STAY AT THE END |
|
2790 |
|
2791 $ cd $TESTTMP/evolve_training_repo |
|
2792 |
|
2793 $ hg log -G --hidden |
|
2794 @ changeset: 32:52e790f9d4c3 |
|
2795 | branch: build/linuxsupport-v2 |
|
2796 | tag: tip |
|
2797 | user: Boris Feld <boris.feld@octobus.net> |
|
2798 | date: Mon Dec 11 11:21:02 2017 +0100 |
|
2799 | summary: Third commit on build/linuxsupport-v2 |
|
2800 | |
|
2801 o changeset: 31:5c069dd03e05 |
|
2802 | branch: build/linuxsupport-v2 |
|
2803 | parent: 18:7b62ce2c283e |
|
2804 | user: Boris Feld <boris.feld@octobus.net> |
|
2805 | date: Mon Dec 11 11:20:24 2017 +0100 |
|
2806 | summary: Second commit on build/linuxsupport-v2 |
|
2807 | |
|
2808 | o changeset: 30:27cb89067c43 |
|
2809 | | branch: histedit |
|
2810 | | user: Boris Feld <boris.feld@octobus.net> |
|
2811 | | date: Sat Dec 09 17:35:15 2017 +0100 |
|
2812 | | summary: Add code for myfeature |
|
2813 | | |
|
2814 | o changeset: 29:a2082e406c4f |
|
2815 | | branch: histedit |
|
2816 | | parent: 14:d102c718e607 |
|
2817 | | user: Boris Feld <boris.feld@octobus.net> |
|
2818 | | date: Sat Dec 09 17:37:15 2017 +0100 |
|
2819 | | summary: Add test for myfeature |
|
2820 | | |
|
2821 | | o changeset: 28:1b7281b1e052 |
|
2822 | | | branch: split |
|
2823 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2824 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2825 | | | summary: To be splitted |
|
2826 | | | |
|
2827 | | o changeset: 27:6fb7bfb44ffe |
|
2828 | | | branch: split |
|
2829 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2830 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2831 | | | summary: To be splitted |
|
2832 | | | |
|
2833 | | o changeset: 26:59f0ddc4bd4b |
|
2834 | | | branch: split |
|
2835 | | | parent: 0:d2eb2ac6a5bd |
|
2836 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2837 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2838 | | | summary: To be splitted |
|
2839 | | | |
|
2840 | | | o changeset: 25:dab6ed4b3c75 |
|
2841 | | |/ branch: fold |
|
2842 | | | parent: 0:d2eb2ac6a5bd |
|
2843 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2844 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2845 | | | summary: add a test |
|
2846 | | | |
|
2847 | | | o changeset: 24:76ace846a3f9 |
|
2848 | | | | branch: amend-extract |
|
2849 | | | | parent: 7:4ae0d1de7a58 |
|
2850 | | | | user: Good User |
|
2851 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
|
2852 | | | | summary: Commit to be extracted |
|
2853 | | | | |
|
2854 | | | | x changeset: 23:008eb7da195a |
|
2855 | | | |/ branch: amend-extract |
|
2856 | | | | parent: 7:4ae0d1de7a58 |
|
2857 | | | | user: Good User |
|
2858 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
|
2859 | | | | obsolete: pruned |
|
2860 | | | | summary: temporary commit for uncommiting 1e04751ef00a |
|
2861 | | | | |
|
2862 | | | | x changeset: 22:1e04751ef00a |
|
2863 | | | |/ branch: amend-extract |
|
2864 | | | | parent: 7:4ae0d1de7a58 |
|
2865 | | | | user: Good User |
|
2866 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
|
2867 | | | | obsolete: amended as 24:76ace846a3f9 |
|
2868 | | | | summary: Commit to be extracted |
|
2869 | | | | |
|
2870 | | | | x changeset: 21:5935c1c3ad24 |
|
2871 | | | |/ branch: amend-extract |
|
2872 | | | | parent: 7:4ae0d1de7a58 |
|
2873 | | | | user: Good User |
|
2874 | | | | date: Fri Dec 08 15:28:46 2017 +0100 |
|
2875 | | | | obsolete: amended as 22:1e04751ef00a |
|
2876 | | | | summary: Commit to be extracted |
|
2877 | | | | |
|
2878 | | | | x changeset: 20:3d2c8a2356a2 |
|
2879 | | | | | branch: build/linuxsupport-v2 |
|
2880 | | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2881 | | | | | date: Mon Dec 11 11:21:02 2017 +0100 |
|
2882 | | | | | obsolete: rebased as 32:52e790f9d4c3 |
|
2883 | | | | | summary: Third commit on build/linuxsupport-v2 |
|
2884 | | | | | |
|
2885 +-------x changeset: 19:4686378320d7 |
|
2886 | | | | branch: build/linuxsupport-v2 |
|
2887 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2888 | | | | date: Mon Dec 11 11:20:24 2017 +0100 |
|
2889 | | | | obsolete: reworded using amend as 31:5c069dd03e05 |
|
2890 | | | | summary: Second commit on build/linuxsupport-v2. |
|
2891 | | | | |
|
2892 o | | | changeset: 18:7b62ce2c283e |
|
2893 | | | | branch: build/linuxsupport-v2 |
|
2894 | | | | parent: 6:0e694460372e |
|
2895 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2896 | | | | date: Thu Dec 07 16:46:32 2017 +0100 |
|
2897 | | | | summary: First commit on build/linuxsupport-v2 |
|
2898 | | | | |
|
2899 | | +---o changeset: 17:708369dc1bfe |
|
2900 | | | | branch: typo |
|
2901 | | | | parent: 0:d2eb2ac6a5bd |
|
2902 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2903 | | | | date: Thu Dec 07 11:26:53 2017 +0100 |
|
2904 | | | | summary: Fix bug |
|
2905 | | | | |
|
2906 | | | | x changeset: 16:1b1e58a9ed27 |
|
2907 | | | | | branch: histedit |
|
2908 | | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2909 | | | | | date: Sat Dec 09 17:37:15 2017 +0100 |
|
2910 | | | | | obsolete: rebased using histedit as 29:a2082e406c4f |
|
2911 | | | | | summary: Add test for myfeature |
|
2912 | | | | | |
|
2913 | +-----x changeset: 15:23eb6f9e4c51 |
|
2914 | | | | branch: histedit |
|
2915 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2916 | | | | date: Sat Dec 09 17:35:15 2017 +0100 |
|
2917 | | | | obsolete: rebased using histedit as 30:27cb89067c43 |
|
2918 | | | | summary: Add code for myfeature |
|
2919 | | | | |
|
2920 | o | | changeset: 14:d102c718e607 |
|
2921 | |/ / branch: histedit |
|
2922 | | | parent: 0:d2eb2ac6a5bd |
|
2923 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2924 | | | date: Sat Dec 09 17:33:15 2017 +0100 |
|
2925 | | | summary: First commit on histedit branch |
|
2926 | | | |
|
2927 | +---x changeset: 13:5d5029b9daed |
|
2928 | | | branch: split |
|
2929 | | | parent: 0:d2eb2ac6a5bd |
|
2930 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2931 | | | date: Fri Dec 08 17:33:15 2017 +0100 |
|
2932 | | | obsolete: split as 26:59f0ddc4bd4b, 27:6fb7bfb44ffe, 28:1b7281b1e052 |
|
2933 | | | summary: To be splitted |
|
2934 | | | |
|
2935 | | | x changeset: 12:966df9f031c1 |
|
2936 | | | | branch: fold |
|
2937 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2938 | | | | date: Fri Dec 08 16:50:38 2017 +0100 |
|
2939 | | | | obsolete: rewritten as 25:dab6ed4b3c75 |
|
2940 | | | | summary: Really fix the test |
|
2941 | | | | |
|
2942 | | | x changeset: 11:b316dc02bddc |
|
2943 | | | | branch: fold |
|
2944 | | | | user: Boris Feld <boris.feld@octobus.net> |
|
2945 | | | | date: Fri Dec 08 16:50:17 2017 +0100 |
|
2946 | | | | obsolete: rewritten as 25:dab6ed4b3c75 |
|
2947 | | | | summary: Fix the test |
|
2948 | | | | |
|
2949 | +---x changeset: 10:03174536bb2a |
|
2950 | | | branch: fold |
|
2951 | | | parent: 0:d2eb2ac6a5bd |
|
2952 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2953 | | | date: Fri Dec 08 16:49:45 2017 +0100 |
|
2954 | | | obsolete: rewritten as 25:dab6ed4b3c75 |
|
2955 | | | summary: add a test |
|
2956 | | | |
|
2957 | +---x changeset: 9:324b72ebbb21 |
|
2958 | | | branch: prune |
|
2959 | | | parent: 0:d2eb2ac6a5bd |
|
2960 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2961 | | | date: Fri Dec 08 16:12:23 2017 +0100 |
|
2962 | | | obsolete: pruned |
|
2963 | | | summary: Commit to prune |
|
2964 | | | |
|
2965 | | | x changeset: 8:e288d12d5e96 |
|
2966 | | |/ branch: amend-extract |
|
2967 | | | user: Bad User |
|
2968 | | | date: Fri Dec 08 15:28:46 2017 +0100 |
|
2969 | | | obsolete: reauthored using amend as 21:5935c1c3ad24 |
|
2970 | | | summary: Commit to be extracted |
|
2971 | | | |
|
2972 | | o changeset: 7:4ae0d1de7a58 |
|
2973 | |/ branch: amend-extract |
|
2974 | | parent: 0:d2eb2ac6a5bd |
|
2975 | | user: Boris Feld <boris.feld@octobus.net> |
|
2976 | | date: Fri Dec 08 15:04:09 2017 +0100 |
|
2977 | | summary: Base file |
|
2978 | | |
|
2979 o | changeset: 6:0e694460372e |
|
2980 | | branch: build/v2 |
|
2981 | | parent: 2:f3bd0ab4ee87 |
|
2982 | | user: Boris Feld <boris.feld@octobus.net> |
|
2983 | | date: Mon Dec 11 11:22:16 2017 +0100 |
|
2984 | | summary: New commit on build/v2 |
|
2985 | | |
|
2986 | | x changeset: 5:39e9774ab30b |
|
2987 | | | branch: build/linuxsupport-v2 |
|
2988 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2989 | | | date: Mon Dec 11 11:21:02 2017 +0100 |
|
2990 | | | obsolete: rebased using rebase as 20:3d2c8a2356a2 |
|
2991 | | | summary: Third commit on build/linuxsupport-v2 |
|
2992 | | | |
|
2993 | | x changeset: 4:5ad93176b041 |
|
2994 | | | branch: build/linuxsupport-v2 |
|
2995 | | | user: Boris Feld <boris.feld@octobus.net> |
|
2996 | | | date: Mon Dec 11 11:20:24 2017 +0100 |
|
2997 | | | obsolete: rebased using rebase as 19:4686378320d7 |
|
2998 | | | summary: Second commit on build/linuxsupport-v2. |
|
2999 | | | |
|
3000 +---x changeset: 3:424916b62f4c |
|
3001 | | branch: build/linuxsupport-v2 |
|
3002 | | user: Boris Feld <boris.feld@octobus.net> |
|
3003 | | date: Thu Dec 07 16:46:32 2017 +0100 |
|
3004 | | obsolete: rebased using rebase as 18:7b62ce2c283e |
|
3005 | | summary: First commit on build/linuxsupport-v2 |
|
3006 | | |
|
3007 o | changeset: 2:f3bd0ab4ee87 |
|
3008 |/ branch: build/v2 |
|
3009 | parent: 0:d2eb2ac6a5bd |
|
3010 | user: Boris Feld <boris.feld@octobus.net> |
|
3011 | date: Thu Dec 07 16:45:07 2017 +0100 |
|
3012 | summary: First commit on build/v2 |
|
3013 | |
|
3014 | x changeset: 1:5d48a444aba7 |
|
3015 |/ branch: typo |
|
3016 | user: Boris Feld <boris.feld@octobus.net> |
|
3017 | date: Thu Dec 07 11:26:53 2017 +0100 |
|
3018 | obsolete: reworded using amend as 17:708369dc1bfe |
|
3019 | summary: Fx bug |
|
3020 | |
|
3021 o changeset: 0:d2eb2ac6a5bd |
|
3022 user: Boris Feld <boris.feld@octobus.net> |
|
3023 date: Thu Dec 07 11:26:05 2017 +0100 |
|
3024 summary: ROOT |
|
3025 |
|
3026 Phases graph repository |
|
3027 ======================= |
|
3028 |
|
3029 $ hg init $TESTTMP/phases |
|
3030 $ cd $TESTTMP/phases |
|
3031 |
|
3032 $ hg commit -m "Public" --config ui.allowemptycommit=true |
|
3033 $ hg phase -p . |
|
3034 |
|
3035 $ hg commit -m "Draft" --config ui.allowemptycommit=true |
|
3036 |
|
3037 $ hg commit -s -m "Secret" --config ui.allowemptycommit=true |
|
3038 |
|
3039 $ hg log -G -T "{rev} {phase}\n" |
|
3040 @ 2 secret |
|
3041 | |
|
3042 o 1 draft |
|
3043 | |
|
3044 o 0 public |
|
3045 |
|
3046 $ graph $TESTDIR/graphs/phases.dot -r "all()" -T "{desc}" |
|
3047 Wrote */graphs/phases.dot (glob) |
|
3048 .. graphviz:: |
|
3049 |
|
3050 strict digraph "Mercurial graph" { |
|
3051 graph [rankdir=LR, |
|
3052 splines=polyline |
|
3053 ]; |
|
3054 node [label="\N"]; |
|
3055 0 [fillcolor="#7F7FFF", |
|
3056 fixedsize=true, |
|
3057 group=default, |
|
3058 height=1, |
|
3059 label=Public, |
|
3060 pin=true, |
|
3061 pos="1,0!", |
|
3062 shape=circle, |
|
3063 style=filled, |
|
3064 width=1]; |
|
3065 1 [fillcolor="#7F7FFF", |
|
3066 fixedsize=true, |
|
3067 group=default, |
|
3068 height=1, |
|
3069 label=Draft, |
|
3070 pin=true, |
|
3071 pos="1,1!", |
|
3072 shape=pentagon, |
|
3073 style=filled, |
|
3074 width=1]; |
|
3075 0 -> 1 [penwidth=2.0]; |
|
3076 2 [fillcolor="#7F7FFF", |
|
3077 fixedsize=true, |
|
3078 group=default, |
|
3079 height=1, |
|
3080 label=Secret, |
|
3081 pin=true, |
|
3082 pos="1,2!", |
|
3083 shape=square, |
|
3084 style=filled, |
|
3085 width=1]; |
|
3086 1 -> 2 [penwidth=2.0]; |
|
3087 } |