Mercurial > evolve

comparison tests/test-evolve-obshistory-complex.t @ 6074:55e9987b8384 mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.8 into mercurial-4.7 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 14:04:23 +0300
parents 011b53a9d03c e82ad19eb3cc
children
comparison
equal deleted inserted replaced
6073:6b67f26f4667 6074:55e9987b8384
68 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" 68 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
69 2 changesets folded 69 2 changesets folded
70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
71 $ hg obslog -r . 71 $ hg obslog -r .
72 @ 100cc25b765f (9) fold2 72 @ 100cc25b765f (9) fold2
73 |\ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 73 |\ rewritten(description, content) from 0da815c333f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
74 | | note: folding changesets to test
75 | | rewritten(description, parent, content) from d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
74 | | note: folding changesets to test 76 | | note: folding changesets to test
75 | | 77 | |
76 x | 0da815c333f6 (5) E 78 x | 0da815c333f6 (5) E
77 / 79 /
78 x d9f908fde1a1 (6) F 80 x d9f908fde1a1 (6) F
100 | | | summary: fold0 102 | | | summary: fold0
101 | | | 103 | | |
102 x | | changeset: 4:868d2e0eb19c 104 x | | changeset: 4:868d2e0eb19c
103 | | | user: test 105 | | | user: test
104 | | | date: Thu Jan 01 00:00:00 1970 +0000 106 | | | date: Thu Jan 01 00:00:00 1970 +0000
105 | | | obsolete: folded using fold as 8:d15d0ffc75f6 107 | | | obsolete: rewritten using fold as 8:d15d0ffc75f6
106 | | | summary: D 108 | | | summary: D
107 | | | 109 | | |
108 x | | changeset: 3:a8df460dbbfe 110 x | | changeset: 3:a8df460dbbfe
109 |/ / user: test 111 |/ / user: test
110 | | date: Thu Jan 01 00:00:00 1970 +0000 112 | | date: Thu Jan 01 00:00:00 1970 +0000
111 | | obsolete: folded using fold as 8:d15d0ffc75f6 113 | | obsolete: rewritten using fold as 8:d15d0ffc75f6
112 | | summary: C 114 | | summary: C
113 | | 115 | |
114 x | changeset: 2:c473644ee0e9 116 x | changeset: 2:c473644ee0e9
115 | | user: test 117 | | user: test
116 | | date: Thu Jan 01 00:00:00 1970 +0000 118 | | date: Thu Jan 01 00:00:00 1970 +0000
117 | | obsolete: folded using fold as 7:b868bc49b0a4 119 | | obsolete: rewritten using fold as 7:b868bc49b0a4
118 | | summary: B 120 | | summary: B
119 | | 121 | |
120 x | changeset: 1:2a34000d3544 122 x | changeset: 1:2a34000d3544
121 |/ user: test 123 |/ user: test
122 | date: Thu Jan 01 00:00:00 1970 +0000 124 | date: Thu Jan 01 00:00:00 1970 +0000
123 | obsolete: folded using fold as 7:b868bc49b0a4 125 | obsolete: rewritten using fold as 7:b868bc49b0a4
124 | summary: A 126 | summary: A
125 | 127 |
126 o changeset: 0:ea207398892e 128 o changeset: 0:ea207398892e
127 user: test 129 user: test
128 date: Thu Jan 01 00:00:00 1970 +0000 130 date: Thu Jan 01 00:00:00 1970 +0000
379 * 7b3290f6e0a0 (12) fold1 381 * 7b3290f6e0a0 (12) fold1
380 |\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) 382 |\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
381 | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000) 383 | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000)
382 | | 384 | |
383 x | d15d0ffc75f6 (8) fold1 385 x | d15d0ffc75f6 (8) fold1
384 |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000) 386 |\ \ rewritten(description, parent, content) from 868d2e0eb19c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
387 | | | rewritten(description, content) from a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
385 | | | 388 | | |
386 | | x e036916b63ea (11) fold0 389 | | x e036916b63ea (11) fold0
387 | | | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) 390 | | | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
388 | | | 391 | | |
389 x | | 868d2e0eb19c (4) D 392 x | | 868d2e0eb19c (4) D
390 / / 393 / /
391 x / a8df460dbbfe (3) C 394 x / a8df460dbbfe (3) C
392 / 395 /
393 x b868bc49b0a4 (7) fold0 396 x b868bc49b0a4 (7) fold0
394 |\ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 397 |\ rewritten(description, content) from 2a34000d3544 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
398 | | rewritten(description, parent, content) from c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
395 | | 399 | |
396 x | 2a34000d3544 (1) A 400 x | 2a34000d3544 (1) A
397 / 401 /
398 x c473644ee0e9 (2) B 402 x c473644ee0e9 (2) B
399 403
406 | | | 410 | | |
407 | | x e036916b63ea (11) fold0 411 | | x e036916b63ea (11) fold0
408 | | | rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) 412 | | | rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
409 | | | 413 | | |
410 x | | 868d2e0eb19c (4) D 414 x | | 868d2e0eb19c (4) D
411 / / folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 415 / / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
412 | | 416 | |
413 x | a8df460dbbfe (3) C 417 x | a8df460dbbfe (3) C
414 / folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 418 / rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
415 | 419 |
416 x b868bc49b0a4 (7) fold0 420 x b868bc49b0a4 (7) fold0
417 |\ split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000) 421 |\ split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
418 | | 422 | |
419 x | 2a34000d3544 (1) A 423 x | 2a34000d3544 (1) A
420 / folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 424 / rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
421 | 425 |
422 x c473644ee0e9 (2) B 426 x c473644ee0e9 (2) B
423 folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 427 rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
424 428
425 While with all option, we should see 15 changesets 429 While with all option, we should see 15 changesets
426 430
427 $ hg obslog --all 15 431 $ hg obslog --all 15
428 o 19e14c8397fc (10) fold0 432 o 19e14c8397fc (10) fold0
439 | | | |/| split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000) 443 | | | |/| split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000)
440 | | | | | rewritten(description, parent, content) from d0f33db50670 using prune by test (Thu Jan 01 00:00:00 1970 +0000) 444 | | | | | rewritten(description, parent, content) from d0f33db50670 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
441 | | | | | note: this is a note stored in obsmarker in prune 445 | | | | | note: this is a note stored in obsmarker in prune
442 | | | | | 446 | | | | |
443 | | | x | 100cc25b765f (9) fold2 447 | | | x | 100cc25b765f (9) fold2
444 | | | |\ \ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 448 | | | |\ \ rewritten(description, content) from 0da815c333f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
449 | | | | | | note: folding changesets to test
450 | | | | | | rewritten(description, parent, content) from d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
445 | | | | | | note: folding changesets to test 451 | | | | | | note: folding changesets to test
446 | | | | | | 452 | | | | | |
447 | +-------x d0f33db50670 (13) fold1 453 | +-------x d0f33db50670 (13) fold1
448 | | | | | split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) 454 | | | | | split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
449 | | | | | 455 | | | | |
451 | | / / split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) 457 | | / / split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
452 | | | | 458 | | | |
453 | | x / 0da815c333f6 (5) E 459 | | x / 0da815c333f6 (5) E
454 | | / 460 | | /
455 x | | b868bc49b0a4 (7) fold0 461 x | | b868bc49b0a4 (7) fold0
456 |\ \ \ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 462 |\ \ \ rewritten(description, content) from 2a34000d3544 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
463 | | | | rewritten(description, parent, content) from c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
457 | | | | 464 | | | |
458 | | x | d15d0ffc75f6 (8) fold1 465 | | x | d15d0ffc75f6 (8) fold1
459 | | |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000) 466 | | |\ \ rewritten(description, parent, content) from 868d2e0eb19c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
467 | | | | | rewritten(description, content) from a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
460 | | | | | 468 | | | | |
461 | | | | x d9f908fde1a1 (6) F 469 | | | | x d9f908fde1a1 (6) F
462 | | | | 470 | | | |
463 x | | | 2a34000d3544 (1) A 471 x | | | 2a34000d3544 (1) A
464 / / / 472 / / /