Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3818:f8677cb11dcb mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 08 Jun 2018 22:52:53 +0530
parents e5ba6531503e 5ca297e78f2c
children 537fd9a86c06
comparison
equal deleted inserted replaced
3817:5ca297e78f2c 3818:f8677cb11dcb
46 $ echo 42 >> A0 46 $ echo 42 >> A0
47 $ hg amend -m "A1 47 $ hg amend -m "A1
48 > 48 >
49 > Better commit message" 49 > Better commit message"
50 $ hg log --hidden -G 50 $ hg log --hidden -G
51 @ changeset: 2:4ae3a4151de9 51 @ changeset: 3:4ae3a4151de9
52 | tag: tip 52 | tag: tip
53 | parent: 0:ea207398892e 53 | parent: 0:ea207398892e
54 | user: test 54 | user: test
55 | date: Thu Jan 01 00:00:00 1970 +0000 55 | date: Thu Jan 01 00:00:00 1970 +0000
56 | summary: A1 56 | summary: A1
57 | 57 |
58 | x changeset: 2:f137d23bb3e1
59 | | user: test
60 | | date: Thu Jan 01 00:00:00 1970 +0000
61 | | obsolete: pruned
62 | | summary: temporary amend commit for 471f378eab4c
63 | |
58 | x changeset: 1:471f378eab4c 64 | x changeset: 1:471f378eab4c
59 |/ user: test 65 |/ user: test
60 | date: Thu Jan 01 00:00:00 1970 +0000 66 | date: Thu Jan 01 00:00:00 1970 +0000
61 | obsolete: rewritten using amend as 2:4ae3a4151de9 67 | obsolete: rewritten as 4ae3a4151de9
62 | summary: A0 68 | summary: A0
63 | 69 |
64 o changeset: 0:ea207398892e 70 o changeset: 0:ea207398892e
65 user: test 71 user: test
66 date: Thu Jan 01 00:00:00 1970 +0000 72 date: Thu Jan 01 00:00:00 1970 +0000
67 summary: ROOT 73 summary: ROOT
68 74
69 Actual test 75 Actual test
70 ----------- 76 -----------
71 $ hg obslog --patch 4ae3a4151de9 77 $ hg obslog --patch 4ae3a4151de9
72 @ 4ae3a4151de9 (2) A1 78 @ 4ae3a4151de9 (3) A1
73 | 79 |
74 x 471f378eab4c (1) A0 80 x 471f378eab4c (1) A0
75 rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob) 81 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
76 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 82 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
77 --- a/changeset-description 83 --- a/changeset-description
78 +++ b/changeset-description 84 +++ b/changeset-description
79 @@ -1,1 +1,3 @@ 85 @@ -1,1 +1,3 @@
80 -A0 86 -A0
89 A0 95 A0
90 +42 96 +42
91 97
92 98
93 $ hg obslog --patch --color debug 99 $ hg obslog --patch --color debug
94 @ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1] 100 @ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1]
95 | 101 |
96 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] 102 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
97 [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] 103 [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
98 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] 104 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
99 [diff.file_a|--- a/changeset-description] 105 [diff.file_a|--- a/changeset-description]
100 [diff.file_b|+++ b/changeset-description] 106 [diff.file_b|+++ b/changeset-description]
101 [diff.hunk|@@ -1,1 +1,3 @@] 107 [diff.hunk|@@ -1,1 +1,3 @@]
102 [diff.deleted|-A0] 108 [diff.deleted|-A0]
112 [diff.inserted|+42] 118 [diff.inserted|+42]
113 119
114 120
115 121
116 $ hg obslog --no-graph --patch 4ae3a4151de9 122 $ hg obslog --no-graph --patch 4ae3a4151de9
117 4ae3a4151de9 (2) A1 123 4ae3a4151de9 (3) A1
118 471f378eab4c (1) A0 124 471f378eab4c (1) A0
119 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 125 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
120 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 126 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
121 --- a/changeset-description 127 --- a/changeset-description
122 +++ b/changeset-description 128 +++ b/changeset-description
123 @@ -1,1 +1,3 @@ 129 @@ -1,1 +1,3 @@
124 -A0 130 -A0
142 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool 148 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
143 [ 149 [
144 { 150 {
145 "markers": [], 151 "markers": [],
146 "node": "4ae3a4151de9", 152 "node": "4ae3a4151de9",
147 "rev": 2, 153 "rev": 3,
148 "shortdescription": "A1" 154 "shortdescription": "A1"
149 }, 155 },
150 { 156 {
151 "markers": [ 157 "markers": [
152 { 158 {
156 ], 162 ],
157 "effect": [ 163 "effect": [
158 "description", 164 "description",
159 "content" 165 "content"
160 ], 166 ],
161 "operation": "amend",
162 "succnodes": [ 167 "succnodes": [
163 "4ae3a4151de9" 168 "4ae3a4151de9"
164 ], 169 ],
165 "user": "test", 170 "user": "test",
166 "verb": "rewritten" 171 "verb": "rewritten"
171 "shortdescription": "A0" 176 "shortdescription": "A0"
172 } 177 }
173 ] 178 ]
174 $ hg obslog --hidden --patch 471f378eab4c 179 $ hg obslog --hidden --patch 471f378eab4c
175 x 471f378eab4c (1) A0 180 x 471f378eab4c (1) A0
176 rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 181 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
177 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description 182 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
178 --- a/changeset-description 183 --- a/changeset-description
179 +++ b/changeset-description 184 +++ b/changeset-description
180 @@ -1,1 +1,3 @@ 185 @@ -1,1 +1,3 @@
181 -A0 186 -A0
202 ], 207 ],
203 "effect": [ 208 "effect": [
204 *, (glob) 209 *, (glob)
205 "content" 210 "content"
206 ], 211 ],
207 "operation": "amend",
208 "succnodes": [ 212 "succnodes": [
209 "4ae3a4151de9" 213 "4ae3a4151de9"
210 ], 214 ],
211 "user": "test", 215 "user": "test",
212 "verb": "rewritten" 216 "verb": "rewritten"
261 $ hg log --hidden -G 265 $ hg log --hidden -G
262 x changeset: 2:0dec01379d3b 266 x changeset: 2:0dec01379d3b
263 | tag: tip 267 | tag: tip
264 | user: test 268 | user: test
265 | date: Thu Jan 01 00:00:00 1970 +0000 269 | date: Thu Jan 01 00:00:00 1970 +0000
266 | obsolete: pruned using prune 270 | obsolete: pruned
267 | summary: B0 271 | summary: B0
268 | 272 |
269 @ changeset: 1:471f378eab4c 273 @ changeset: 1:471f378eab4c
270 | user: test 274 | user: test
271 | date: Thu Jan 01 00:00:00 1970 +0000 275 | date: Thu Jan 01 00:00:00 1970 +0000
280 Actual test 284 Actual test
281 ----------- 285 -----------
282 286
283 $ hg obslog 'desc(B0)' --hidden --patch 287 $ hg obslog 'desc(B0)' --hidden --patch
284 x 0dec01379d3b (2) B0 288 x 0dec01379d3b (2) B0
285 pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000) 289 pruned by test (Thu Jan 01 00:00:00 1970 +0000)
286 (No patch available, no successors) 290 (No patch available, no successors)
287 291
288 $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool 292 $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
289 [ 293 [
290 { 294 {
292 { 296 {
293 "date": [ 297 "date": [
294 *, (glob) 298 *, (glob)
295 0 (glob) 299 0 (glob)
296 ], 300 ],
297 "operation": "prune",
298 "user": "test", 301 "user": "test",
299 "verb": "pruned" 302 "verb": "pruned"
300 } 303 }
301 ], 304 ],
302 "node": "0dec01379d3b", 305 "node": "0dec01379d3b",
359 > n 362 > n
360 > n 363 > n
361 > y 364 > y
362 > y 365 > y
363 > EOF 366 > EOF
367 current hg version does not support storing note in obsmarker
364 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 368 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
365 adding a 369 adding a
366 adding b 370 adding b
367 diff --git a/a b/a 371 diff --git a/a b/a
368 new file mode 100644 372 new file mode 100644
402 | summary: A0 406 | summary: A0
403 | 407 |
404 | x changeset: 1:471597cad322 408 | x changeset: 1:471597cad322
405 |/ user: test 409 |/ user: test
406 | date: Thu Jan 01 00:00:00 1970 +0000 410 | date: Thu Jan 01 00:00:00 1970 +0000
407 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a 411 | obsolete: split as 337fec4d2edc, f257fde29c7a
408 | summary: A0 412 | summary: A0
409 | 413 |
410 o changeset: 0:ea207398892e 414 o changeset: 0:ea207398892e
411 user: test 415 user: test
412 date: Thu Jan 01 00:00:00 1970 +0000 416 date: Thu Jan 01 00:00:00 1970 +0000
416 ----------- 420 -----------
417 421
418 Check that debugobshistory on splitted commit show both targets 422 Check that debugobshistory on splitted commit show both targets
419 $ hg obslog 471597cad322 --hidden --patch 423 $ hg obslog 471597cad322 --hidden --patch
420 x 471597cad322 (1) A0 424 x 471597cad322 (1) A0
421 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 425 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
422 note: testing split 426 note: testing split
423 (No patch available, too many successors (2)) 427 (No patch available, too many successors (2))
424 428
425 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool 429 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
426 [ 430 [
434 "effect": [ 438 "effect": [
435 "parent", 439 "parent",
436 "content" 440 "content"
437 ], 441 ],
438 "note": "testing split", 442 "note": "testing split",
439 "operation": "split",
440 "succnodes": [ 443 "succnodes": [
441 "337fec4d2edc", 444 "337fec4d2edc",
442 "f257fde29c7a" 445 "f257fde29c7a"
443 ], 446 ],
444 "user": "test", 447 "user": "test",
454 the revision plus the splitted one 457 the revision plus the splitted one
455 $ hg obslog 337fec4d2edc --patch 458 $ hg obslog 337fec4d2edc --patch
456 o 337fec4d2edc (2) A0 459 o 337fec4d2edc (2) A0
457 | 460 |
458 x 471597cad322 (1) A0 461 x 471597cad322 (1) A0
459 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 462 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
460 note: testing split 463 note: testing split
461 (No patch available, too many successors (2)) 464 (No patch available, too many successors (2))
462 465
463 With the all option, it should show the three changesets 466 With the all option, it should show the three changesets
464 $ hg obslog --all 337fec4d2edc --patch 467 $ hg obslog --all 337fec4d2edc --patch
465 o 337fec4d2edc (2) A0 468 o 337fec4d2edc (2) A0
466 | 469 |
467 | @ f257fde29c7a (3) A0 470 | @ f257fde29c7a (3) A0
468 |/ 471 |/
469 x 471597cad322 (1) A0 472 x 471597cad322 (1) A0
470 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 473 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
471 note: testing split 474 note: testing split
472 (No patch available, too many successors (2)) 475 (No patch available, too many successors (2))
473 476
474 Check that debugobshistory on the second successor after split show 477 Check that debugobshistory on the second successor after split show
475 the revision plus the splitted one 478 the revision plus the splitted one
476 $ hg obslog f257fde29c7a --patch 479 $ hg obslog f257fde29c7a --patch
477 @ f257fde29c7a (3) A0 480 @ f257fde29c7a (3) A0
478 | 481 |
479 x 471597cad322 (1) A0 482 x 471597cad322 (1) A0
480 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 483 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
481 note: testing split 484 note: testing split
482 (No patch available, too many successors (2)) 485 (No patch available, too many successors (2))
483 486
484 With the all option, it should show the three changesets 487 With the all option, it should show the three changesets
485 $ hg obslog f257fde29c7a --all --patch 488 $ hg obslog f257fde29c7a --all --patch
486 o 337fec4d2edc (2) A0 489 o 337fec4d2edc (2) A0
487 | 490 |
488 | @ f257fde29c7a (3) A0 491 | @ f257fde29c7a (3) A0
489 |/ 492 |/
490 x 471597cad322 (1) A0 493 x 471597cad322 (1) A0
491 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 494 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
492 note: testing split 495 note: testing split
493 (No patch available, too many successors (2)) 496 (No patch available, too many successors (2))
494 497
495 Obslog with all option all should also works on the splitted commit 498 Obslog with all option all should also works on the splitted commit
496 $ hg obslog -a 471597cad322 --hidden --patch 499 $ hg obslog -a 471597cad322 --hidden --patch
497 o 337fec4d2edc (2) A0 500 o 337fec4d2edc (2) A0
498 | 501 |
499 | @ f257fde29c7a (3) A0 502 | @ f257fde29c7a (3) A0
500 |/ 503 |/
501 x 471597cad322 (1) A0 504 x 471597cad322 (1) A0
502 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 505 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
503 note: testing split 506 note: testing split
504 (No patch available, too many successors (2)) 507 (No patch available, too many successors (2))
505 508
506 Check that debugobshistory on both successors after split show 509 Check that debugobshistory on both successors after split show
507 a coherent graph 510 a coherent graph
509 o 337fec4d2edc (2) A0 512 o 337fec4d2edc (2) A0
510 | 513 |
511 | @ f257fde29c7a (3) A0 514 | @ f257fde29c7a (3) A0
512 |/ 515 |/
513 x 471597cad322 (1) A0 516 x 471597cad322 (1) A0
514 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 517 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
515 note: testing split 518 note: testing split
516 (No patch available, too many successors (2)) 519 (No patch available, too many successors (2))
517 520
518 $ hg update 471597cad322 521 $ hg update 471597cad322
519 abort: hidden revision '471597cad322'! 522 abort: hidden revision '471597cad322'!
665 | summary: A0 668 | summary: A0
666 | 669 |
667 | x changeset: 1:de7290d8b885 670 | x changeset: 1:de7290d8b885
668 |/ user: test 671 |/ user: test
669 | date: Thu Jan 01 00:00:00 1970 +0000 672 | date: Thu Jan 01 00:00:00 1970 +0000
670 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b 673 | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
671 | summary: A0 674 | summary: A0
672 | 675 |
673 o changeset: 0:ea207398892e 676 o changeset: 0:ea207398892e
674 user: test 677 user: test
675 date: Thu Jan 01 00:00:00 1970 +0000 678 date: Thu Jan 01 00:00:00 1970 +0000
678 Actual test 681 Actual test
679 ----------- 682 -----------
680 683
681 $ hg obslog de7290d8b885 --hidden --patch 684 $ hg obslog de7290d8b885 --hidden --patch
682 x de7290d8b885 (1) A0 685 x de7290d8b885 (1) A0
683 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 686 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
684 (No patch available, too many successors (4)) 687 (No patch available, too many successors (4))
685 688
686 $ hg obslog de7290d8b885 --hidden --all --patch 689 $ hg obslog de7290d8b885 --hidden --all --patch
687 o 1ae8bc733a14 (4) A0 690 o 1ae8bc733a14 (4) A0
688 | 691 |
691 | @ c7f044602e9b (5) A0 694 | @ c7f044602e9b (5) A0
692 |/ 695 |/
693 | o f257fde29c7a (3) A0 696 | o f257fde29c7a (3) A0
694 |/ 697 |/
695 x de7290d8b885 (1) A0 698 x de7290d8b885 (1) A0
696 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 699 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
697 (No patch available, too many successors (4)) 700 (No patch available, too many successors (4))
698 701
699 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool 702 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
700 [ 703 [
701 { 704 {
707 ], 710 ],
708 "effect": [ 711 "effect": [
709 "parent", 712 "parent",
710 "content" 713 "content"
711 ], 714 ],
712 "operation": "split",
713 "succnodes": [ 715 "succnodes": [
714 "1ae8bc733a14", 716 "1ae8bc733a14",
715 "337fec4d2edc", 717 "337fec4d2edc",
716 "c7f044602e9b", 718 "c7f044602e9b",
717 "f257fde29c7a" 719 "f257fde29c7a"
727 ] 729 ]
728 $ hg obslog c7f044602e9b --patch 730 $ hg obslog c7f044602e9b --patch
729 @ c7f044602e9b (5) A0 731 @ c7f044602e9b (5) A0
730 | 732 |
731 x de7290d8b885 (1) A0 733 x de7290d8b885 (1) A0
732 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 734 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
733 (No patch available, too many successors (4)) 735 (No patch available, too many successors (4))
734 736
735 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool 737 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
736 [ 738 [
737 { 739 {
749 ], 751 ],
750 "effect": [ 752 "effect": [
751 "parent", 753 "parent",
752 "content" 754 "content"
753 ], 755 ],
754 "operation": "split",
755 "succnodes": [ 756 "succnodes": [
756 "1ae8bc733a14", 757 "1ae8bc733a14",
757 "337fec4d2edc", 758 "337fec4d2edc",
758 "c7f044602e9b", 759 "c7f044602e9b",
759 "f257fde29c7a" 760 "f257fde29c7a"
776 | @ c7f044602e9b (5) A0 777 | @ c7f044602e9b (5) A0
777 |/ 778 |/
778 | o f257fde29c7a (3) A0 779 | o f257fde29c7a (3) A0
779 |/ 780 |/
780 x de7290d8b885 (1) A0 781 x de7290d8b885 (1) A0
781 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 782 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
782 (No patch available, too many successors (4)) 783 (No patch available, too many successors (4))
783 784
784 $ hg obslog 5 --all --patch 785 $ hg obslog 5 --all --patch
785 o 1ae8bc733a14 (4) A0 786 o 1ae8bc733a14 (4) A0
786 | 787 |
789 | @ c7f044602e9b (5) A0 790 | @ c7f044602e9b (5) A0
790 |/ 791 |/
791 | o f257fde29c7a (3) A0 792 | o f257fde29c7a (3) A0
792 |/ 793 |/
793 x de7290d8b885 (1) A0 794 x de7290d8b885 (1) A0
794 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 795 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
795 (No patch available, too many successors (4)) 796 (No patch available, too many successors (4))
796 797
797 $ hg update de7290d8b885 798 $ hg update de7290d8b885
798 abort: hidden revision 'de7290d8b885'! 799 abort: hidden revision 'de7290d8b885'!
799 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) 800 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
843 | summary: C0 844 | summary: C0
844 | 845 |
845 | x changeset: 2:0dec01379d3b 846 | x changeset: 2:0dec01379d3b
846 | | user: test 847 | | user: test
847 | | date: Thu Jan 01 00:00:00 1970 +0000 848 | | date: Thu Jan 01 00:00:00 1970 +0000
848 | | obsolete: rewritten using fold as 3:eb5a0daa2192 849 | | obsolete: rewritten as eb5a0daa2192
849 | | summary: B0 850 | | summary: B0
850 | | 851 | |
851 | x changeset: 1:471f378eab4c 852 | x changeset: 1:471f378eab4c
852 |/ user: test 853 |/ user: test
853 | date: Thu Jan 01 00:00:00 1970 +0000 854 | date: Thu Jan 01 00:00:00 1970 +0000
854 | obsolete: rewritten using fold as 3:eb5a0daa2192 855 | obsolete: rewritten as eb5a0daa2192
855 | summary: A0 856 | summary: A0
856 | 857 |
857 o changeset: 0:ea207398892e 858 o changeset: 0:ea207398892e
858 user: test 859 user: test
859 date: Thu Jan 01 00:00:00 1970 +0000 860 date: Thu Jan 01 00:00:00 1970 +0000
864 865
865 Check that debugobshistory on the first folded revision show only 866 Check that debugobshistory on the first folded revision show only
866 the revision with the target 867 the revision with the target
867 $ hg obslog --hidden 471f378eab4c --patch 868 $ hg obslog --hidden 471f378eab4c --patch
868 x 471f378eab4c (1) A0 869 x 471f378eab4c (1) A0
869 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 870 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
870 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 871 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
871 --- a/changeset-description 872 --- a/changeset-description
872 +++ b/changeset-description 873 +++ b/changeset-description
873 @@ -1,1 +1,1 @@ 874 @@ -1,1 +1,1 @@
874 -A0 875 -A0
884 Check that with all option, all changesets are shown 885 Check that with all option, all changesets are shown
885 $ hg obslog --hidden --all 471f378eab4c --patch 886 $ hg obslog --hidden --all 471f378eab4c --patch
886 @ eb5a0daa2192 (3) C0 887 @ eb5a0daa2192 (3) C0
887 |\ 888 |\
888 x | 0dec01379d3b (2) B0 889 x | 0dec01379d3b (2) B0
889 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 890 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
890 | (No patch available, changesets rebased) 891 | (No patch available, changesets rebased)
891 | 892 |
892 x 471f378eab4c (1) A0 893 x 471f378eab4c (1) A0
893 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 894 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
894 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 895 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
895 --- a/changeset-description 896 --- a/changeset-description
896 +++ b/changeset-description 897 +++ b/changeset-description
897 @@ -1,1 +1,1 @@ 898 @@ -1,1 +1,1 @@
898 -A0 899 -A0
907 908
908 Check that debugobshistory on the second folded revision show only 909 Check that debugobshistory on the second folded revision show only
909 the revision with the target 910 the revision with the target
910 $ hg obslog --hidden 0dec01379d3b --patch 911 $ hg obslog --hidden 0dec01379d3b --patch
911 x 0dec01379d3b (2) B0 912 x 0dec01379d3b (2) B0
912 rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 913 rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
913 (No patch available, changesets rebased) 914 (No patch available, changesets rebased)
914 915
915 Check that with all option, all changesets are shown 916 Check that with all option, all changesets are shown
916 $ hg obslog --hidden --all 0dec01379d3b --patch 917 $ hg obslog --hidden --all 0dec01379d3b --patch
917 @ eb5a0daa2192 (3) C0 918 @ eb5a0daa2192 (3) C0
918 |\ 919 |\
919 x | 0dec01379d3b (2) B0 920 x | 0dec01379d3b (2) B0
920 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 921 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
921 | (No patch available, changesets rebased) 922 | (No patch available, changesets rebased)
922 | 923 |
923 x 471f378eab4c (1) A0 924 x 471f378eab4c (1) A0
924 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 925 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
925 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 926 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
926 --- a/changeset-description 927 --- a/changeset-description
927 +++ b/changeset-description 928 +++ b/changeset-description
928 @@ -1,1 +1,1 @@ 929 @@ -1,1 +1,1 @@
929 -A0 930 -A0
940 graph 941 graph
941 $ hg obslog eb5a0daa2192 --patch 942 $ hg obslog eb5a0daa2192 --patch
942 @ eb5a0daa2192 (3) C0 943 @ eb5a0daa2192 (3) C0
943 |\ 944 |\
944 x | 0dec01379d3b (2) B0 945 x | 0dec01379d3b (2) B0
945 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 946 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
946 | (No patch available, changesets rebased) 947 | (No patch available, changesets rebased)
947 | 948 |
948 x 471f378eab4c (1) A0 949 x 471f378eab4c (1) A0
949 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 950 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
950 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 951 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
951 --- a/changeset-description 952 --- a/changeset-description
952 +++ b/changeset-description 953 +++ b/changeset-description
953 @@ -1,1 +1,1 @@ 954 @@ -1,1 +1,1 @@
954 -A0 955 -A0
975 "date": [ 976 "date": [
976 *, (glob) 977 *, (glob)
977 0 (glob) 978 0 (glob)
978 ], 979 ],
979 "effect": [ 980 "effect": [
980 "description", 981 *, (glob)
981 "content" 982 "content"
982 ], 983 ],
983 "operation": "fold",
984 "succnodes": [ 984 "succnodes": [
985 "eb5a0daa2192" 985 "eb5a0daa2192"
986 ], 986 ],
987 "user": "test", 987 "user": "test",
988 "verb": "rewritten" 988 "verb": "rewritten"
994 }, 994 },
995 { 995 {
996 "markers": [ 996 "markers": [
997 { 997 {
998 "date": [ 998 "date": [
999 *, (glob) 999 0.0,
1000 0 (glob) 1000 0 (glob)
1001 ], 1001 ],
1002 "effect": [ 1002 "effect": [
1003 "description", 1003 "description",
1004 "parent", 1004 "parent",
1005 "content" 1005 "content"
1006 ], 1006 ],
1007 "operation": "fold",
1008 "succnodes": [ 1007 "succnodes": [
1009 "eb5a0daa2192" 1008 "eb5a0daa2192"
1010 ], 1009 ],
1011 "user": "test", 1010 "user": "test",
1012 "verb": "rewritten" 1011 "verb": "rewritten"
1054 | summary: A1 1053 | summary: A1
1055 | 1054 |
1056 | x changeset: 1:471f378eab4c 1055 | x changeset: 1:471f378eab4c
1057 |/ user: test 1056 |/ user: test
1058 | date: Thu Jan 01 00:00:00 1970 +0000 1057 | date: Thu Jan 01 00:00:00 1970 +0000
1059 | obsolete: reworded using amend as 2:fdf9bde5129a 1058 | obsolete: reworded as fdf9bde5129a
1060 | summary: A0 1059 | summary: A0
1061 | 1060 |
1062 o changeset: 0:ea207398892e 1061 o changeset: 0:ea207398892e
1063 user: test 1062 user: test
1064 date: Thu Jan 01 00:00:00 1970 +0000 1063 date: Thu Jan 01 00:00:00 1970 +0000
1067 $ hg update --hidden 'desc(A0)' 1066 $ hg update --hidden 'desc(A0)'
1068 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1067 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1069 working directory parent is obsolete! (471f378eab4c) 1068 working directory parent is obsolete! (471f378eab4c)
1070 (use 'hg evolve' to update to its successor: fdf9bde5129a) 1069 (use 'hg evolve' to update to its successor: fdf9bde5129a)
1071 $ hg amend -m "A2" 1070 $ hg amend -m "A2"
1072 2 new content-divergent changesets 1071 2 new divergent changesets
1073 $ hg log --hidden -G 1072 $ hg log --hidden -G
1074 @ changeset: 3:65b757b745b9 1073 @ changeset: 3:65b757b745b9
1075 | tag: tip 1074 | tag: tip
1076 | parent: 0:ea207398892e 1075 | parent: 0:ea207398892e
1077 | user: test 1076 | user: test
1078 | date: Thu Jan 01 00:00:00 1970 +0000 1077 | date: Thu Jan 01 00:00:00 1970 +0000
1079 | instability: content-divergent 1078 | trouble: divergent
1080 | summary: A2 1079 | summary: A2
1081 | 1080 |
1082 | o changeset: 2:fdf9bde5129a 1081 | o changeset: 2:fdf9bde5129a
1083 |/ parent: 0:ea207398892e 1082 |/ parent: 0:ea207398892e
1084 | user: test 1083 | user: test
1085 | date: Thu Jan 01 00:00:00 1970 +0000 1084 | date: Thu Jan 01 00:00:00 1970 +0000
1086 | instability: content-divergent 1085 | trouble: divergent
1087 | summary: A1 1086 | summary: A1
1088 | 1087 |
1089 | x changeset: 1:471f378eab4c 1088 | x changeset: 1:471f378eab4c
1090 |/ user: test 1089 |/ user: test
1091 | date: Thu Jan 01 00:00:00 1970 +0000 1090 | date: Thu Jan 01 00:00:00 1970 +0000
1092 | obsolete: reworded using amend as 2:fdf9bde5129a 1091 | obsolete: reworded as fdf9bde5129a
1093 | obsolete: reworded using amend as 3:65b757b745b9 1092 | obsolete: reworded as 65b757b745b9
1094 | summary: A0 1093 | summary: A0
1095 | 1094 |
1096 o changeset: 0:ea207398892e 1095 o changeset: 0:ea207398892e
1097 user: test 1096 user: test
1098 date: Thu Jan 01 00:00:00 1970 +0000 1097 date: Thu Jan 01 00:00:00 1970 +0000
1102 ----------- 1101 -----------
1103 1102
1104 Check that debugobshistory on the divergent revision show both destinations 1103 Check that debugobshistory on the divergent revision show both destinations
1105 $ hg obslog --hidden 471f378eab4c --patch 1104 $ hg obslog --hidden 471f378eab4c --patch
1106 x 471f378eab4c (1) A0 1105 x 471f378eab4c (1) A0
1107 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1106 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
1108 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 1107 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
1109 --- a/changeset-description 1108 --- a/changeset-description
1110 +++ b/changeset-description 1109 +++ b/changeset-description
1111 @@ -1,1 +1,1 @@ 1110 @@ -1,1 +1,1 @@
1112 -A0 1111 -A0
1113 +A2 1112 +A2
1114 1113
1115 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1114 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1116 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1115 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1117 --- a/changeset-description 1116 --- a/changeset-description
1118 +++ b/changeset-description 1117 +++ b/changeset-description
1119 @@ -1,1 +1,1 @@ 1118 @@ -1,1 +1,1 @@
1120 -A0 1119 -A0
1127 @ 65b757b745b9 (3) A2 1126 @ 65b757b745b9 (3) A2
1128 | 1127 |
1129 | o fdf9bde5129a (2) A1 1128 | o fdf9bde5129a (2) A1
1130 |/ 1129 |/
1131 x 471f378eab4c (1) A0 1130 x 471f378eab4c (1) A0
1132 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1131 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
1133 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 1132 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
1134 --- a/changeset-description 1133 --- a/changeset-description
1135 +++ b/changeset-description 1134 +++ b/changeset-description
1136 @@ -1,1 +1,1 @@ 1135 @@ -1,1 +1,1 @@
1137 -A0 1136 -A0
1138 +A2 1137 +A2
1139 1138
1140 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1139 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1141 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1140 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1142 --- a/changeset-description 1141 --- a/changeset-description
1143 +++ b/changeset-description 1142 +++ b/changeset-description
1144 @@ -1,1 +1,1 @@ 1143 @@ -1,1 +1,1 @@
1145 -A0 1144 -A0
1156 0 (glob) 1155 0 (glob)
1157 ], 1156 ],
1158 "effect": [ 1157 "effect": [
1159 "description" 1158 "description"
1160 ], 1159 ],
1161 "operation": "amend",
1162 "succnodes": [ 1160 "succnodes": [
1163 "65b757b745b9" 1161 "65b757b745b9"
1164 ], 1162 ],
1165 "user": "test", 1163 "user": "test",
1166 "verb": "rewritten" 1164 "verb": "rewritten"
1171 0 (glob) 1169 0 (glob)
1172 ], 1170 ],
1173 "effect": [ 1171 "effect": [
1174 "description" 1172 "description"
1175 ], 1173 ],
1176 "operation": "amend",
1177 "succnodes": [ 1174 "succnodes": [
1178 "fdf9bde5129a" 1175 "fdf9bde5129a"
1179 ], 1176 ],
1180 "user": "test", 1177 "user": "test",
1181 "verb": "rewritten" 1178 "verb": "rewritten"
1190 and the diverent one 1187 and the diverent one
1191 $ hg obslog fdf9bde5129a --patch 1188 $ hg obslog fdf9bde5129a --patch
1192 o fdf9bde5129a (2) A1 1189 o fdf9bde5129a (2) A1
1193 | 1190 |
1194 x 471f378eab4c (1) A0 1191 x 471f378eab4c (1) A0
1195 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1192 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
1196 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 1193 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
1197 --- a/changeset-description 1194 --- a/changeset-description
1198 +++ b/changeset-description 1195 +++ b/changeset-description
1199 @@ -1,1 +1,1 @@ 1196 @@ -1,1 +1,1 @@
1200 -A0 1197 -A0
1201 +A2 1198 +A2
1202 1199
1203 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1200 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1204 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1201 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1205 --- a/changeset-description 1202 --- a/changeset-description
1206 +++ b/changeset-description 1203 +++ b/changeset-description
1207 @@ -1,1 +1,1 @@ 1204 @@ -1,1 +1,1 @@
1208 -A0 1205 -A0
1215 @ 65b757b745b9 (3) A2 1212 @ 65b757b745b9 (3) A2
1216 | 1213 |
1217 | o fdf9bde5129a (2) A1 1214 | o fdf9bde5129a (2) A1
1218 |/ 1215 |/
1219 x 471f378eab4c (1) A0 1216 x 471f378eab4c (1) A0
1220 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1217 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
1221 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 1218 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
1222 --- a/changeset-description 1219 --- a/changeset-description
1223 +++ b/changeset-description 1220 +++ b/changeset-description
1224 @@ -1,1 +1,1 @@ 1221 @@ -1,1 +1,1 @@
1225 -A0 1222 -A0
1226 +A2 1223 +A2
1227 1224
1228 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1225 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1229 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1226 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1230 --- a/changeset-description 1227 --- a/changeset-description
1231 +++ b/changeset-description 1228 +++ b/changeset-description
1232 @@ -1,1 +1,1 @@ 1229 @@ -1,1 +1,1 @@
1233 -A0 1230 -A0
1238 and the diverent one 1235 and the diverent one
1239 $ hg obslog 65b757b745b9 --patch 1236 $ hg obslog 65b757b745b9 --patch
1240 @ 65b757b745b9 (3) A2 1237 @ 65b757b745b9 (3) A2
1241 | 1238 |
1242 x 471f378eab4c (1) A0 1239 x 471f378eab4c (1) A0
1243 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1240 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
1244 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 1241 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
1245 --- a/changeset-description 1242 --- a/changeset-description
1246 +++ b/changeset-description 1243 +++ b/changeset-description
1247 @@ -1,1 +1,1 @@ 1244 @@ -1,1 +1,1 @@
1248 -A0 1245 -A0
1249 +A2 1246 +A2
1250 1247
1251 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1248 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1252 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1249 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1253 --- a/changeset-description 1250 --- a/changeset-description
1254 +++ b/changeset-description 1251 +++ b/changeset-description
1255 @@ -1,1 +1,1 @@ 1252 @@ -1,1 +1,1 @@
1256 -A0 1253 -A0
1262 @ 65b757b745b9 (3) A2 1259 @ 65b757b745b9 (3) A2
1263 | 1260 |
1264 | o fdf9bde5129a (2) A1 1261 | o fdf9bde5129a (2) A1
1265 |/ 1262 |/
1266 x 471f378eab4c (1) A0 1263 x 471f378eab4c (1) A0
1267 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1264 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
1268 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 1265 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
1269 --- a/changeset-description 1266 --- a/changeset-description
1270 +++ b/changeset-description 1267 +++ b/changeset-description
1271 @@ -1,1 +1,1 @@ 1268 @@ -1,1 +1,1 @@
1272 -A0 1269 -A0
1273 +A2 1270 +A2
1274 1271
1275 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1272 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1276 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1273 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1277 --- a/changeset-description 1274 --- a/changeset-description
1278 +++ b/changeset-description 1275 +++ b/changeset-description
1279 @@ -1,1 +1,1 @@ 1276 @@ -1,1 +1,1 @@
1280 -A0 1277 -A0
1287 @ 65b757b745b9 (3) A2 1284 @ 65b757b745b9 (3) A2
1288 | 1285 |
1289 | o fdf9bde5129a (2) A1 1286 | o fdf9bde5129a (2) A1
1290 |/ 1287 |/
1291 x 471f378eab4c (1) A0 1288 x 471f378eab4c (1) A0
1292 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1289 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
1293 diff -r 471f378eab4c -r 65b757b745b9 changeset-description 1290 diff -r 471f378eab4c -r 65b757b745b9 changeset-description
1294 --- a/changeset-description 1291 --- a/changeset-description
1295 +++ b/changeset-description 1292 +++ b/changeset-description
1296 @@ -1,1 +1,1 @@ 1293 @@ -1,1 +1,1 @@
1297 -A0 1294 -A0
1298 +A2 1295 +A2
1299 1296
1300 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1297 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1301 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1298 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1302 --- a/changeset-description 1299 --- a/changeset-description
1303 +++ b/changeset-description 1300 +++ b/changeset-description
1304 @@ -1,1 +1,1 @@ 1301 @@ -1,1 +1,1 @@
1305 -A0 1302 -A0
1322 0 (glob) 1319 0 (glob)
1323 ], 1320 ],
1324 "effect": [ 1321 "effect": [
1325 "description" 1322 "description"
1326 ], 1323 ],
1327 "operation": "amend",
1328 "succnodes": [ 1324 "succnodes": [
1329 "65b757b745b9" 1325 "65b757b745b9"
1330 ], 1326 ],
1331 "user": "test", 1327 "user": "test",
1332 "verb": "rewritten" 1328 "verb": "rewritten"
1337 0 (glob) 1333 0 (glob)
1338 ], 1334 ],
1339 "effect": [ 1335 "effect": [
1340 "description" 1336 "description"
1341 ], 1337 ],
1342 "operation": "amend",
1343 "succnodes": [ 1338 "succnodes": [
1344 "fdf9bde5129a" 1339 "fdf9bde5129a"
1345 ], 1340 ],
1346 "user": "test", 1341 "user": "test",
1347 "verb": "rewritten" 1342 "verb": "rewritten"
1388 | summary: B1 1383 | summary: B1
1389 | 1384 |
1390 | x changeset: 2:0dec01379d3b 1385 | x changeset: 2:0dec01379d3b
1391 |/ user: test 1386 |/ user: test
1392 | date: Thu Jan 01 00:00:00 1970 +0000 1387 | date: Thu Jan 01 00:00:00 1970 +0000
1393 | obsolete: reworded using amend as 3:b7ea6d14e664 1388 | obsolete: reworded as b7ea6d14e664
1394 | summary: B0 1389 | summary: B0
1395 | 1390 |
1396 o changeset: 1:471f378eab4c 1391 o changeset: 1:471f378eab4c
1397 | user: test 1392 | user: test
1398 | date: Thu Jan 01 00:00:00 1970 +0000 1393 | date: Thu Jan 01 00:00:00 1970 +0000
1416 | 1411 |
1417 | x changeset: 3:b7ea6d14e664 1412 | x changeset: 3:b7ea6d14e664
1418 | | parent: 1:471f378eab4c 1413 | | parent: 1:471f378eab4c
1419 | | user: test 1414 | | user: test
1420 | | date: Thu Jan 01 00:00:00 1970 +0000 1415 | | date: Thu Jan 01 00:00:00 1970 +0000
1421 | | obsolete: rewritten using fold as 4:eb5a0daa2192 1416 | | obsolete: rewritten as eb5a0daa2192
1422 | | summary: B1 1417 | | summary: B1
1423 | | 1418 | |
1424 | | x changeset: 2:0dec01379d3b 1419 | | x changeset: 2:0dec01379d3b
1425 | |/ user: test 1420 | |/ user: test
1426 | | date: Thu Jan 01 00:00:00 1970 +0000 1421 | | date: Thu Jan 01 00:00:00 1970 +0000
1427 | | obsolete: reworded using amend as 3:b7ea6d14e664 1422 | | obsolete: reworded as b7ea6d14e664
1428 | | summary: B0 1423 | | summary: B0
1429 | | 1424 | |
1430 | x changeset: 1:471f378eab4c 1425 | x changeset: 1:471f378eab4c
1431 |/ user: test 1426 |/ user: test
1432 | date: Thu Jan 01 00:00:00 1970 +0000 1427 | date: Thu Jan 01 00:00:00 1970 +0000
1433 | obsolete: rewritten using fold as 4:eb5a0daa2192 1428 | obsolete: rewritten as eb5a0daa2192
1434 | summary: A0 1429 | summary: A0
1435 | 1430 |
1436 o changeset: 0:ea207398892e 1431 o changeset: 0:ea207398892e
1437 user: test 1432 user: test
1438 date: Thu Jan 01 00:00:00 1970 +0000 1433 date: Thu Jan 01 00:00:00 1970 +0000
1444 Check that debugobshistory on head show a coherent graph 1439 Check that debugobshistory on head show a coherent graph
1445 $ hg obslog eb5a0daa2192 --patch 1440 $ hg obslog eb5a0daa2192 --patch
1446 @ eb5a0daa2192 (4) C0 1441 @ eb5a0daa2192 (4) C0
1447 |\ 1442 |\
1448 x | 471f378eab4c (1) A0 1443 x | 471f378eab4c (1) A0
1449 / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 1444 / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
1450 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 1445 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
1451 | --- a/changeset-description 1446 | --- a/changeset-description
1452 | +++ b/changeset-description 1447 | +++ b/changeset-description
1453 | @@ -1,1 +1,1 @@ 1448 | @@ -1,1 +1,1 @@
1454 | -A0 1449 | -A0
1460 | @@ -0,0 +1,1 @@ 1455 | @@ -0,0 +1,1 @@
1461 | +B0 1456 | +B0
1462 | 1457 |
1463 | 1458 |
1464 x b7ea6d14e664 (3) B1 1459 x b7ea6d14e664 (3) B1
1465 | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 1460 | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
1466 | (No patch available, changesets rebased) 1461 | (No patch available, changesets rebased)
1467 | 1462 |
1468 x 0dec01379d3b (2) B0 1463 x 0dec01379d3b (2) B0
1469 rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1464 rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
1470 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description 1465 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
1471 --- a/changeset-description 1466 --- a/changeset-description
1472 +++ b/changeset-description 1467 +++ b/changeset-description
1473 @@ -1,1 +1,1 @@ 1468 @@ -1,1 +1,1 @@
1474 -B0 1469 -B0
1478 Check that obslog on ROOT with all option show everything 1473 Check that obslog on ROOT with all option show everything
1479 $ hg obslog 1 --hidden --all --patch 1474 $ hg obslog 1 --hidden --all --patch
1480 @ eb5a0daa2192 (4) C0 1475 @ eb5a0daa2192 (4) C0
1481 |\ 1476 |\
1482 x | 471f378eab4c (1) A0 1477 x | 471f378eab4c (1) A0
1483 / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 1478 / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
1484 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 1479 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
1485 | --- a/changeset-description 1480 | --- a/changeset-description
1486 | +++ b/changeset-description 1481 | +++ b/changeset-description
1487 | @@ -1,1 +1,1 @@ 1482 | @@ -1,1 +1,1 @@
1488 | -A0 1483 | -A0
1494 | @@ -0,0 +1,1 @@ 1489 | @@ -0,0 +1,1 @@
1495 | +B0 1490 | +B0
1496 | 1491 |
1497 | 1492 |
1498 x b7ea6d14e664 (3) B1 1493 x b7ea6d14e664 (3) B1
1499 | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 1494 | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
1500 | (No patch available, changesets rebased) 1495 | (No patch available, changesets rebased)
1501 | 1496 |
1502 x 0dec01379d3b (2) B0 1497 x 0dec01379d3b (2) B0
1503 rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1498 rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
1504 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description 1499 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
1505 --- a/changeset-description 1500 --- a/changeset-description
1506 +++ b/changeset-description 1501 +++ b/changeset-description
1507 @@ -1,1 +1,1 @@ 1502 @@ -1,1 +1,1 @@
1508 -B0 1503 -B0
1527 "effect": [ 1522 "effect": [
1528 *, (glob) 1523 *, (glob)
1529 *, (glob) 1524 *, (glob)
1530 "content" 1525 "content"
1531 ], 1526 ],
1532 "operation": "fold",
1533 "succnodes": [ 1527 "succnodes": [
1534 "eb5a0daa2192" 1528 "eb5a0daa2192"
1535 ], 1529 ],
1536 "user": "test", 1530 "user": "test",
1537 "verb": "rewritten" 1531 "verb": "rewritten"
1543 }, 1537 },
1544 { 1538 {
1545 "markers": [ 1539 "markers": [
1546 { 1540 {
1547 "date": [ 1541 "date": [
1548 *, (glob) 1542 0.0,
1549 0 (glob) 1543 0 (glob)
1550 ], 1544 ],
1551 "effect": [ 1545 "effect": [
1552 "description" 1546 "description"
1553 ], 1547 ],
1554 "operation": "amend",
1555 "succnodes": [ 1548 "succnodes": [
1556 "b7ea6d14e664" 1549 "b7ea6d14e664"
1557 ], 1550 ],
1558 "user": "test", 1551 "user": "test",
1559 "verb": "rewritten" 1552 "verb": "rewritten"
1565 }, 1558 },
1566 { 1559 {
1567 "markers": [ 1560 "markers": [
1568 { 1561 {
1569 "date": [ 1562 "date": [
1570 *, (glob) 1563 0.0,
1571 0 (glob) 1564 0 (glob)
1572 ], 1565 ],
1573 "effect": [ 1566 "effect": [
1574 "description", 1567 "description",
1575 "content" 1568 "content"
1576 ], 1569 ],
1577 "operation": "fold",
1578 "succnodes": [ 1570 "succnodes": [
1579 "eb5a0daa2192" 1571 "eb5a0daa2192"
1580 ], 1572 ],
1581 "user": "test", 1573 "user": "test",
1582 "verb": "rewritten" 1574 "verb": "rewritten"
1655 | 1647 |
1656 | x changeset: 2:fdf9bde5129a 1648 | x changeset: 2:fdf9bde5129a
1657 |/ parent: 0:ea207398892e 1649 |/ parent: 0:ea207398892e
1658 | user: test 1650 | user: test
1659 | date: Thu Jan 01 00:00:00 1970 +0000 1651 | date: Thu Jan 01 00:00:00 1970 +0000
1660 | obsolete: reworded using amend as 3:7a230b46bf61 1652 | obsolete: reworded as 7a230b46bf61
1661 | summary: A1 1653 | summary: A1
1662 | 1654 |
1663 | x changeset: 1:471f378eab4c 1655 | x changeset: 1:471f378eab4c
1664 |/ user: test 1656 |/ user: test
1665 | date: Thu Jan 01 00:00:00 1970 +0000 1657 | date: Thu Jan 01 00:00:00 1970 +0000
1666 | obsolete: reworded using amend as 2:fdf9bde5129a 1658 | obsolete: reworded as fdf9bde5129a
1667 | summary: A0 1659 | summary: A0
1668 | 1660 |
1669 o changeset: 0:ea207398892e 1661 o changeset: 0:ea207398892e
1670 user: test 1662 user: test
1671 date: Thu Jan 01 00:00:00 1970 +0000 1663 date: Thu Jan 01 00:00:00 1970 +0000
1676 1668
1677 $ hg obslog 7a230b46bf61 --patch 1669 $ hg obslog 7a230b46bf61 --patch
1678 @ 7a230b46bf61 (3) A2 1670 @ 7a230b46bf61 (3) A2
1679 | 1671 |
1680 x fdf9bde5129a (2) A1 1672 x fdf9bde5129a (2) A1
1681 | rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1673 | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
1682 | diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description 1674 | diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
1683 | --- a/changeset-description 1675 | --- a/changeset-description
1684 | +++ b/changeset-description 1676 | +++ b/changeset-description
1685 | @@ -1,1 +1,1 @@ 1677 | @@ -1,1 +1,1 @@
1686 | -A1 1678 | -A1
1687 | +A2 1679 | +A2
1688 | 1680 |
1689 | 1681 |
1690 x 471f378eab4c (1) A0 1682 x 471f378eab4c (1) A0
1691 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1683 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1692 diff -r 471f378eab4c -r fdf9bde5129a changeset-description 1684 diff -r 471f378eab4c -r fdf9bde5129a changeset-description
1693 --- a/changeset-description 1685 --- a/changeset-description
1694 +++ b/changeset-description 1686 +++ b/changeset-description
1695 @@ -1,1 +1,1 @@ 1687 @@ -1,1 +1,1 @@
1696 -A0 1688 -A0
1705 adding manifests 1697 adding manifests
1706 adding file changes 1698 adding file changes
1707 added 1 changesets with 0 changes to 1 files (+1 heads) 1699 added 1 changesets with 0 changes to 1 files (+1 heads)
1708 2 new obsolescence markers 1700 2 new obsolescence markers
1709 obsoleted 1 changesets 1701 obsoleted 1 changesets
1710 new changesets 7a230b46bf61
1711 (run 'hg heads' to see heads, 'hg merge' to merge) 1702 (run 'hg heads' to see heads, 'hg merge' to merge)
1712 working directory parent is obsolete! (471f378eab4c) 1703 working directory parent is obsolete! (471f378eab4c)
1713 (use 'hg evolve' to update to its successor: 7a230b46bf61) 1704 (use 'hg evolve' to update to its successor: 7a230b46bf61)
1714 Check that debugobshistory works with markers pointing to missing local 1705 Check that debugobshistory works with markers pointing to missing local
1715 changectx 1706 changectx
1716 $ hg obslog 7a230b46bf61 --patch 1707 $ hg obslog 7a230b46bf61 --patch
1717 o 7a230b46bf61 (2) A2 1708 o 7a230b46bf61 (2) A2
1718 | 1709 |
1719 x fdf9bde5129a 1710 x fdf9bde5129a
1720 | rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1711 | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
1721 | (No patch available, context is not local) 1712 | (No patch available, context is not local)
1722 | 1713 |
1723 @ 471f378eab4c (1) A0 1714 @ 471f378eab4c (1) A0
1724 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1715 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
1725 (No patch available, successor is unknown locally) 1716 (No patch available, successor is unknown locally)
1726 1717
1727 $ hg obslog 7a230b46bf61 --color=debug --patch 1718 $ hg obslog 7a230b46bf61 --color=debug --patch
1728 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] 1719 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
1729 | 1720 |
1730 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] 1721 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
1731 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] 1722 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
1732 | (No patch available, context is not local) 1723 | (No patch available, context is not local)
1733 | 1724 |
1734 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] 1725 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
1735 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] 1726 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
1736 (No patch available, successor is unknown locally) 1727 (No patch available, successor is unknown locally)
1737 1728