Mercurial > evolve

comparison tests/test-obsolete.t @ 4174:e07e764c0f48 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 Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 15:20:54 +0200
parents 537fd9a86c06 e268f7fd7839
children 3d917da5bd95
comparison
equal deleted inserted replaced
4173:e268f7fd7839 4174:e07e764c0f48
126 $ hg parents 126 $ hg parents
127 changeset: 3:0d3f46688ccc 127 changeset: 3:0d3f46688ccc
128 parent: 1:7c3bad9141dc 128 parent: 1:7c3bad9141dc
129 user: test 129 user: test
130 date: Thu Jan 01 00:00:00 1970 +0000 130 date: Thu Jan 01 00:00:00 1970 +0000
131 obsolete: rewritten as 4:725c380fe99b 131 obsolete: rewritten as 725c380fe99b
132 summary: add obsol_c 132 summary: add obsol_c
133 133
134 working directory parent is obsolete! (0d3f46688ccc) 134 working directory parent is obsolete! (0d3f46688ccc)
135 (use 'hg evolve' to update to its successor: 725c380fe99b) 135 (use 'hg evolve' to update to its successor: 725c380fe99b)
136 $ mkcommit d # 5 (on 3) 136 $ mkcommit d # 5 (on 3)
137 1 new orphan changesets 137 1 new unstable changesets
138 $ qlog -r 'obsolete()' 138 $ qlog -r 'obsolete()'
139 3 139 3
140 - 0d3f46688ccc 140 - 0d3f46688ccc
141 141
142 $ qlog -r 'extinct()' --hidden 142 $ qlog -r 'extinct()' --hidden
173 abort: empty revision set 173 abort: empty revision set
174 [255] 174 [255]
175 $ hg push ../other-new 175 $ hg push ../other-new
176 pushing to ../other-new 176 pushing to ../other-new
177 searching for changes 177 searching for changes
178 abort: push includes orphan changeset: a7a6f2b5d8a5! 178 abort: push includes unstable changeset: a7a6f2b5d8a5!
179 (use 'hg evolve' to get a stable history or --force to ignore warnings) 179 (use 'hg evolve' to get a stable history or --force to ignore warnings)
180 [255] 180 [255]
181 $ hg push -f ../other-new 181 $ hg push -f ../other-new
182 pushing to ../other-new 182 pushing to ../other-new
183 searching for changes 183 searching for changes
208 - 1f0dee641bb7 208 - 1f0dee641bb7
209 $ hg up --hidden 3 -q 209 $ hg up --hidden 3 -q
210 working directory parent is obsolete! (0d3f46688ccc) 210 working directory parent is obsolete! (0d3f46688ccc)
211 $ mkcommit obsol_d # 6 211 $ mkcommit obsol_d # 6
212 created new head 212 created new head
213 1 new orphan changesets 213 1 new unstable changesets
214 $ hg debugobsolete `getid 5` `getid 6` 214 $ hg debugobsolete `getid 5` `getid 6`
215 obsoleted 1 changesets 215 obsoleted 1 changesets
216 $ qlog 216 $ qlog
217 6 217 6
218 - 95de7fc6918d 218 - 95de7fc6918d
228 3 228 3
229 - 0d3f46688ccc 229 - 0d3f46688ccc
230 $ hg push ../other-new 230 $ hg push ../other-new
231 pushing to ../other-new 231 pushing to ../other-new
232 searching for changes 232 searching for changes
233 abort: push includes orphan changeset: 95de7fc6918d! 233 abort: push includes unstable changeset: 95de7fc6918d!
234 (use 'hg evolve' to get a stable history or --force to ignore warnings) 234 (use 'hg evolve' to get a stable history or --force to ignore warnings)
235 [255] 235 [255]
236 $ hg push ../other-new -f # use f because there is unstability 236 $ hg push ../other-new -f # use f because there is unstability
237 pushing to ../other-new 237 pushing to ../other-new
238 searching for changes 238 searching for changes
267 267
268 $ hg up --hidden -q .^ # 3 268 $ hg up --hidden -q .^ # 3
269 working directory parent is obsolete! (0d3f46688ccc) 269 working directory parent is obsolete! (0d3f46688ccc)
270 $ mkcommit "obsol_d'" # 7 270 $ mkcommit "obsol_d'" # 7
271 created new head 271 created new head
272 1 new orphan changesets 272 1 new unstable changesets
273 $ hg debugobsolete `getid 6` `getid 7` 273 $ hg debugobsolete `getid 6` `getid 7`
274 obsoleted 1 changesets 274 obsoleted 1 changesets
275 $ hg pull -R ../other-new . 275 $ hg pull -R ../other-new .
276 pulling from . 276 pulling from .
277 searching for changes 277 searching for changes
279 adding manifests 279 adding manifests
280 adding file changes 280 adding file changes
281 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 281 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
282 1 new obsolescence markers 282 1 new obsolescence markers
283 obsoleted 1 changesets 283 obsoleted 1 changesets
284 new changesets 909a0fb57e5d
285 (run 'hg heads' to see heads, 'hg merge' to merge) 284 (run 'hg heads' to see heads, 'hg merge' to merge)
286 $ qlog -R ../other-new 285 $ qlog -R ../other-new
287 6 286 6
288 - 909a0fb57e5d 287 - 909a0fb57e5d
289 3 288 3
358 357
359 $ hg up --hidden .^ -q # 3 358 $ hg up --hidden .^ -q # 3
360 working directory parent is obsolete! (0d3f46688ccc) 359 working directory parent is obsolete! (0d3f46688ccc)
361 $ mkcommit "obsol_d''" 360 $ mkcommit "obsol_d''"
362 created new head 361 created new head
363 1 new orphan changesets 362 1 new unstable changesets
364 $ hg debugobsolete `getid 7` `getid 8` 363 $ hg debugobsolete `getid 7` `getid 8`
365 obsoleted 1 changesets 364 obsoleted 1 changesets
366 $ cd ../other-new 365 $ cd ../other-new
367 $ hg up -q 3 366 $ hg up -q 3
368 $ hg pull ../local/ 367 $ hg pull ../local/
372 adding manifests 371 adding manifests
373 adding file changes 372 adding file changes
374 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 373 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
375 1 new obsolescence markers 374 1 new obsolescence markers
376 obsoleted 1 changesets 375 obsoleted 1 changesets
377 new changesets 159dfc9fa5d3
378 (run 'hg heads' to see heads, 'hg merge' to merge) 376 (run 'hg heads' to see heads, 'hg merge' to merge)
379 377
380 $ hg up -q 7 # to check rollback update behavior 378 $ hg up -q 7 # to check rollback update behavior
381 $ qlog 379 $ qlog
382 7 380 7
397 add obsol_c' 395 add obsol_c'
398 branch: default 396 branch: default
399 commit: 1 deleted, 2 unknown (clean) 397 commit: 1 deleted, 2 unknown (clean)
400 update: 2 new changesets, 2 branch heads (merge) 398 update: 2 new changesets, 2 branch heads (merge)
401 phases: 4 draft 399 phases: 4 draft
402 orphan: 1 changesets 400 unstable: 1 changesets
403 $ qlog 401 $ qlog
404 6 402 6
405 - 909a0fb57e5d 403 - 909a0fb57e5d
406 3 404 3
407 - 725c380fe99b 405 - 725c380fe99b
520 should not rebase extinct changesets 518 should not rebase extinct changesets
521 519
522 #excluded 'whole rebase set is extinct and ignored.' message not in core 520 #excluded 'whole rebase set is extinct and ignored.' message not in core
523 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
524 rebasing 3:0d3f46688ccc "add obsol_c" 522 rebasing 3:0d3f46688ccc "add obsol_c"
525 rebasing 8:159dfc9fa5d3 "add obsol_d''" 523 rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
526 2 new content-divergent changesets 524 2 new divergent changesets
527 $ hg --hidden log -q -r 'successors(3)' 525 $ hg --hidden log -q -r 'successors(3)'
528 4:725c380fe99b 526 4:725c380fe99b
529 10:2033b4e49474 527 10:2033b4e49474
530 $ hg up tip 528 $ hg up tip
531 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) 529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
572 check bumped detection 570 check bumped detection
573 (make an obsolete changeset public) 571 (make an obsolete changeset public)
574 572
575 $ cd local 573 $ cd local
576 $ hg phase --hidden --public 11 574 $ hg phase --hidden --public 11
577 1 new phase-divergent changesets 575 1 new bumped changesets
578 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' 576 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
579 @ 12 - (draft) 6db5e282cb91 add obsol_d''' 577 @ 12 - (draft) 6db5e282cb91 add obsol_d'''
580 | 578 |
581 | o 11 - (public) 9468a5f5d8b2 add obsol_d'' 579 | o 11 - (public) 9468a5f5d8b2 add obsol_d''
582 |/ 580 |/
592 changeset: 12:6db5e282cb91 590 changeset: 12:6db5e282cb91
593 tag: tip 591 tag: tip
594 parent: 10:2033b4e49474 592 parent: 10:2033b4e49474
595 user: test 593 user: test
596 date: Thu Jan 01 00:00:00 1970 +0000 594 date: Thu Jan 01 00:00:00 1970 +0000
597 instability: phase-divergent 595 trouble: bumped
598 summary: add obsol_d''' 596 summary: add obsol_d'''
599 597
600 $ hg push ../other-new/ 598 $ hg push ../other-new/
601 pushing to ../other-new/ 599 pushing to ../other-new/
602 searching for changes 600 searching for changes
603 abort: push includes phase-divergent changeset: 6db5e282cb91! 601 abort: push includes bumped changeset: 6db5e282cb91!
604 (use 'hg evolve' to get a stable history or --force to ignore warnings) 602 (use 'hg evolve' to get a stable history or --force to ignore warnings)
605 [255] 603 [255]
606 604
607 Check hg commit --amend compat 605 Check hg commit --amend compat
608 606
611 $ mkcommit f 609 $ mkcommit f
612 created new head 610 created new head
613 $ echo 42 >> f 611 $ echo 42 >> f
614 $ hg commit --amend --traceback --quiet 612 $ hg commit --amend --traceback --quiet
615 $ hg log -G 613 $ hg log -G
616 @ changeset: 14:705ab2a6b72e 614 @ changeset: 15:705ab2a6b72e
617 | tag: tip 615 | tag: tip
618 | parent: 10:2033b4e49474 616 | parent: 10:2033b4e49474
619 | user: test 617 | user: test
620 | date: Thu Jan 01 00:00:00 1970 +0000 618 | date: Thu Jan 01 00:00:00 1970 +0000
621 | summary: add f 619 | summary: add f
622 | 620 |
623 | o changeset: 12:6db5e282cb91 621 | o changeset: 12:6db5e282cb91
624 |/ parent: 10:2033b4e49474 622 |/ parent: 10:2033b4e49474
625 | user: test 623 | user: test
626 | date: Thu Jan 01 00:00:00 1970 +0000 624 | date: Thu Jan 01 00:00:00 1970 +0000
627 | instability: phase-divergent 625 | trouble: bumped
628 | summary: add obsol_d''' 626 | summary: add obsol_d'''
629 | 627 |
630 | o changeset: 11:9468a5f5d8b2 628 | o changeset: 11:9468a5f5d8b2
631 |/ user: test 629 |/ user: test
632 | date: Thu Jan 01 00:00:00 1970 +0000 630 | date: Thu Jan 01 00:00:00 1970 +0000
660 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 658 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
661 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 659 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
662 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 660 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
663 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 661 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
664 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 662 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
665 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 663 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
666 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 664 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
667 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 665 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
668 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} 666 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
669 #no produced by 2.3 667 #no produced by 2.3
670 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) 668 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
671 669
672 Check divergence detection (note: multiple successors is sorted by changeset hash) 670 Check divergence detection (note: multiple successors is sorted by changeset hash)
673 671
674 $ hg up 9468a5f5d8b2 # add obsol_d'' 672 $ hg up 9468a5f5d8b2 # add obsol_d''
675 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 673 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
676 $ mkcommit "obsolet_conflicting_d" 674 $ mkcommit "obsolet_conflicting_d"
677 $ hg summary 675 $ hg summary
678 parent: 15:50f11e5e3a63 tip 676 parent: 1[46]:50f11e5e3a63 tip (re)
679 add obsolet_conflicting_d 677 add obsolet_conflicting_d
680 branch: default 678 branch: default
681 commit: (clean) 679 commit: (clean)
682 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) 680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
683 phases: 3 draft 681 phases: 3 draft
684 phase-divergent: 1 changesets 682 bumped: 1 changesets
685 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` 683 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
686 $ hg log -r 'contentdivergent()' 684 $ hg log -r 'contentdivergent()'
687 changeset: 12:6db5e282cb91 685 changeset: 12:6db5e282cb91
688 parent: 10:2033b4e49474 686 parent: 10:2033b4e49474
689 user: test 687 user: test
690 date: Thu Jan 01 00:00:00 1970 +0000 688 date: Thu Jan 01 00:00:00 1970 +0000
691 instability: phase-divergent, content-divergent 689 trouble: bumped, divergent
692 summary: add obsol_d''' 690 summary: add obsol_d'''
693 691
694 changeset: 15:50f11e5e3a63 692 changeset: 16:50f11e5e3a63
695 tag: tip 693 tag: tip
696 parent: 11:9468a5f5d8b2 694 parent: 11:9468a5f5d8b2
697 user: test 695 user: test
698 date: Thu Jan 01 00:00:00 1970 +0000 696 date: Thu Jan 01 00:00:00 1970 +0000
699 instability: content-divergent 697 trouble: divergent
700 summary: add obsolet_conflicting_d 698 summary: add obsolet_conflicting_d
701 699
702 700
703 $ hg up --hidden 3 -q 701 $ hg up --hidden 3 -q
704 working directory parent is obsolete! (0d3f46688ccc) 702 working directory parent is obsolete! (0d3f46688ccc)
707 [4] add obsol_c' 705 [4] add obsol_c'
708 [10] add obsol_c 706 [10] add obsol_c
709 [2] 707 [2]
710 $ hg olog 708 $ hg olog
711 @ 0d3f46688ccc (3) add obsol_c 709 @ 0d3f46688ccc (3) add obsol_c
712 | rewritten(parent) as 2033b4e49474 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 710 | rewritten(parent) as 2033b4e49474 by test (Thu Jan 01 00:00:00 1970 +0000)
713 | rewritten as 725c380fe99b by test (Thu Jan 01 00:00:00 1970 +0000) 711 | rewritten as 725c380fe99b by test (Thu Jan 01 00:00:00 1970 +0000)
714 | 712 |
715 x 4538525df7e2 (2) add c 713 x 4538525df7e2 (2) add c
716 rewritten as 0d3f46688ccc by test (Thu Jan 01 00:00:00 1970 +0000) 714 rewritten as 0d3f46688ccc by test (Thu Jan 01 00:00:00 1970 +0000)
717 715
722 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 720 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
723 working directory parent is obsolete! (4538525df7e2) 721 working directory parent is obsolete! (4538525df7e2)
724 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 722 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
725 $ hg export 9468a5f5d8b2 | hg import - 723 $ hg export 9468a5f5d8b2 | hg import -
726 applying patch from stdin 724 applying patch from stdin
727 1 new orphan changesets 725 1 new unstable changesets
728 726
729 727
730 Relevant marker computation 728 Relevant marker computation
731 ============================== 729 ==============================
732 730
733 $ hg log -G --hidden 731 $ hg log -G --hidden
734 @ changeset: 16:a5f7a21fe7bc 732 @ changeset: 17:a5f7a21fe7bc
735 | tag: tip 733 | tag: tip
736 | parent: 2:4538525df7e2 734 | parent: 2:4538525df7e2
737 | user: test 735 | user: test
738 | date: Thu Jan 01 00:00:00 1970 +0000 736 | date: Thu Jan 01 00:00:00 1970 +0000
739 | instability: orphan 737 | trouble: unstable
740 | summary: add obsol_d'' 738 | summary: add obsol_d''
741 | 739 |
742 | o changeset: 15:50f11e5e3a63 740 | o changeset: 16:50f11e5e3a63
743 | | parent: 11:9468a5f5d8b2 741 | | parent: 11:9468a5f5d8b2
744 | | user: test 742 | | user: test
745 | | date: Thu Jan 01 00:00:00 1970 +0000 743 | | date: Thu Jan 01 00:00:00 1970 +0000
746 | | instability: content-divergent 744 | | trouble: divergent
747 | | summary: add obsolet_conflicting_d 745 | | summary: add obsolet_conflicting_d
748 | | 746 | |
749 | | o changeset: 14:705ab2a6b72e 747 | | o changeset: 15:705ab2a6b72e
750 | | | parent: 10:2033b4e49474 748 | | | parent: 10:2033b4e49474
751 | | | user: test 749 | | | user: test
752 | | | date: Thu Jan 01 00:00:00 1970 +0000 750 | | | date: Thu Jan 01 00:00:00 1970 +0000
753 | | | summary: add f 751 | | | summary: add f
754 | | | 752 | | |
753 | | | x changeset: 14:33d458d86621
754 | | | | user: test
755 | | | | date: Thu Jan 01 00:00:00 1970 +0000
756 | | | | obsolete: pruned
757 | | | | summary: temporary amend commit for 0b1b6dd009c0
758 | | | |
755 | | | x changeset: 13:0b1b6dd009c0 759 | | | x changeset: 13:0b1b6dd009c0
756 | | |/ parent: 10:2033b4e49474 760 | | |/ parent: 10:2033b4e49474
757 | | | user: test 761 | | | user: test
758 | | | date: Thu Jan 01 00:00:00 1970 +0000 762 | | | date: Thu Jan 01 00:00:00 1970 +0000
759 | | | obsolete: amended using amend as 14:705ab2a6b72e 763 | | | obsolete: amended as 705ab2a6b72e
760 | | | summary: add f 764 | | | summary: add f
761 | | | 765 | | |
762 | | | o changeset: 12:6db5e282cb91 766 | | | o changeset: 12:6db5e282cb91
763 | | |/ parent: 10:2033b4e49474 767 | | |/ parent: 10:2033b4e49474
764 | | | user: test 768 | | | user: test
765 | | | date: Thu Jan 01 00:00:00 1970 +0000 769 | | | date: Thu Jan 01 00:00:00 1970 +0000
766 | | | instability: phase-divergent, content-divergent 770 | | | trouble: bumped, divergent
767 | | | summary: add obsol_d''' 771 | | | summary: add obsol_d'''
768 | | | 772 | | |
769 | o | changeset: 11:9468a5f5d8b2 773 | o | changeset: 11:9468a5f5d8b2
770 | |/ user: test 774 | |/ user: test
771 | | date: Thu Jan 01 00:00:00 1970 +0000 775 | | date: Thu Jan 01 00:00:00 1970 +0000
786 | | 790 | |
787 | | x changeset: 8:159dfc9fa5d3 791 | | x changeset: 8:159dfc9fa5d3
788 | | | parent: 3:0d3f46688ccc 792 | | | parent: 3:0d3f46688ccc
789 | | | user: test 793 | | | user: test
790 | | | date: Thu Jan 01 00:00:00 1970 +0000 794 | | | date: Thu Jan 01 00:00:00 1970 +0000
791 | | | obsolete: rebased using rebase as 11:9468a5f5d8b2 795 | | | obsolete: rebased as 9468a5f5d8b2
792 | | | summary: add obsol_d'' 796 | | | summary: add obsol_d''
793 | | | 797 | | |
794 | | | x changeset: 7:909a0fb57e5d 798 | | | x changeset: 7:909a0fb57e5d
795 | | |/ parent: 3:0d3f46688ccc 799 | | |/ parent: 3:0d3f46688ccc
796 | | | user: test 800 | | | user: test
797 | | | date: Thu Jan 01 00:00:00 1970 +0000 801 | | | date: Thu Jan 01 00:00:00 1970 +0000
798 | | | obsolete: rewritten as 8:159dfc9fa5d3 802 | | | obsolete: rewritten as 159dfc9fa5d3
799 | | | summary: add obsol_d' 803 | | | summary: add obsol_d'
800 | | | 804 | | |
801 | | | x changeset: 6:95de7fc6918d 805 | | | x changeset: 6:95de7fc6918d
802 | | |/ parent: 3:0d3f46688ccc 806 | | |/ parent: 3:0d3f46688ccc
803 | | | user: test 807 | | | user: test
804 | | | date: Thu Jan 01 00:00:00 1970 +0000 808 | | | date: Thu Jan 01 00:00:00 1970 +0000
805 | | | obsolete: rewritten as 7:909a0fb57e5d 809 | | | obsolete: rewritten as 909a0fb57e5d
806 | | | summary: add obsol_d 810 | | | summary: add obsol_d
807 | | | 811 | | |
808 | | | x changeset: 5:a7a6f2b5d8a5 812 | | | x changeset: 5:a7a6f2b5d8a5
809 | | |/ parent: 3:0d3f46688ccc 813 | | |/ parent: 3:0d3f46688ccc
810 | | | user: test 814 | | | user: test
811 | | | date: Thu Jan 01 00:00:00 1970 +0000 815 | | | date: Thu Jan 01 00:00:00 1970 +0000
812 | | | obsolete: rewritten as 6:95de7fc6918d 816 | | | obsolete: rewritten as 95de7fc6918d
813 | | | obsolete: rewritten as 15:50f11e5e3a63 817 | | | obsolete: rewritten as 50f11e5e3a63
814 | | | summary: add d 818 | | | summary: add d
815 | | | 819 | | |
816 | o | changeset: 4:725c380fe99b 820 | o | changeset: 4:725c380fe99b
817 | | | parent: 1:7c3bad9141dc 821 | | | parent: 1:7c3bad9141dc
818 | | | user: test 822 | | | user: test
821 | | | 825 | | |
822 | | x changeset: 3:0d3f46688ccc 826 | | x changeset: 3:0d3f46688ccc
823 | |/ parent: 1:7c3bad9141dc 827 | |/ parent: 1:7c3bad9141dc
824 | | user: test 828 | | user: test
825 | | date: Thu Jan 01 00:00:00 1970 +0000 829 | | date: Thu Jan 01 00:00:00 1970 +0000
826 | | obsolete: rewritten as 4:725c380fe99b 830 | | obsolete: rewritten as 725c380fe99b
827 | | obsolete: rebased using rebase as 10:2033b4e49474 831 | | obsolete: rebased as 2033b4e49474
828 | | summary: add obsol_c 832 | | summary: add obsol_c
829 | | 833 | |
830 x | changeset: 2:4538525df7e2 834 x | changeset: 2:4538525df7e2
831 |/ user: test 835 |/ user: test
832 | date: Thu Jan 01 00:00:00 1970 +0000 836 | date: Thu Jan 01 00:00:00 1970 +0000
833 | obsolete: rewritten as 3:0d3f46688ccc 837 | obsolete: rewritten as 0d3f46688ccc
834 | summary: add c 838 | summary: add c
835 | 839 |
836 o changeset: 1:7c3bad9141dc 840 o changeset: 1:7c3bad9141dc
837 | user: test 841 | user: test
838 | date: Thu Jan 01 00:00:00 1970 +0000 842 | date: Thu Jan 01 00:00:00 1970 +0000
850 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 854 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851 855
852 simple rewrite with a prune attached to it 856 simple rewrite with a prune attached to it
853 857
854 $ hg debugobsolete --rev 15 858 $ hg debugobsolete --rev 15
855 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 50f11e5e3a63806e678c734e525502f522d37e38 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 859 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
860 33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob)
856 861
857 Transitive rewrite 862 Transitive rewrite
858 863
859 $ hg --hidden debugobsolete --rev 8 864 $ hg --hidden debugobsolete --rev 8
860 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 865 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}