equal
deleted
inserted
replaced
119 3 |
119 3 |
120 - 0d3f46688ccc |
120 - 0d3f46688ccc |
121 4 |
121 4 |
122 - 725c380fe99b |
122 - 725c380fe99b |
123 $ hg up --hidden 3 -q |
123 $ hg up --hidden 3 -q |
124 updating to a hidden changeset 0d3f46688ccc |
|
125 (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) |
|
126 working directory parent is obsolete! (0d3f46688ccc) |
124 working directory parent is obsolete! (0d3f46688ccc) |
127 (reported by parents too) |
125 (reported by parents too) |
128 $ hg parents |
126 $ hg parents |
129 changeset: 3:0d3f46688ccc |
127 changeset: 3:0d3f46688ccc |
130 parent: 1:7c3bad9141dc |
128 parent: 1:7c3bad9141dc |
186 adding changesets |
184 adding changesets |
187 adding manifests |
185 adding manifests |
188 adding file changes |
186 adding file changes |
189 added 5 changesets with 5 changes to 5 files (+1 heads) |
187 added 5 changesets with 5 changes to 5 files (+1 heads) |
190 2 new obsolescence markers |
188 2 new obsolescence markers |
191 1 new orphan changesets |
|
192 $ hg -R ../other-new verify |
189 $ hg -R ../other-new verify |
193 checking changesets |
190 checking changesets |
194 checking manifests |
191 checking manifests |
195 crosschecking files in changesets and manifests |
192 crosschecking files in changesets and manifests |
196 checking files |
193 checking files |
210 0 |
207 0 |
211 - 1f0dee641bb7 |
208 - 1f0dee641bb7 |
212 $ hg up --hidden 3 -q |
209 $ hg up --hidden 3 -q |
213 working directory parent is obsolete! (0d3f46688ccc) |
210 working directory parent is obsolete! (0d3f46688ccc) |
214 $ mkcommit obsol_d # 6 |
211 $ mkcommit obsol_d # 6 |
|
212 created new head |
215 1 new orphan changesets |
213 1 new orphan changesets |
216 created new head |
|
217 $ hg debugobsolete `getid 5` `getid 6` |
214 $ hg debugobsolete `getid 5` `getid 6` |
218 obsoleted 1 changesets |
215 obsoleted 1 changesets |
219 $ qlog |
216 $ qlog |
220 6 |
217 6 |
221 - 95de7fc6918d |
218 - 95de7fc6918d |
269 [1] |
266 [1] |
270 |
267 |
271 $ hg up --hidden -q .^ # 3 |
268 $ hg up --hidden -q .^ # 3 |
272 working directory parent is obsolete! (0d3f46688ccc) |
269 working directory parent is obsolete! (0d3f46688ccc) |
273 $ mkcommit "obsol_d'" # 7 |
270 $ mkcommit "obsol_d'" # 7 |
|
271 created new head |
274 1 new orphan changesets |
272 1 new orphan changesets |
275 created new head |
|
276 $ hg debugobsolete `getid 6` `getid 7` |
273 $ hg debugobsolete `getid 6` `getid 7` |
277 obsoleted 1 changesets |
274 obsoleted 1 changesets |
278 $ hg pull -R ../other-new . |
275 $ hg pull -R ../other-new . |
279 pulling from . |
276 pulling from . |
280 searching for changes |
277 searching for changes |
360 Test rollback support |
357 Test rollback support |
361 |
358 |
362 $ hg up --hidden .^ -q # 3 |
359 $ hg up --hidden .^ -q # 3 |
363 working directory parent is obsolete! (0d3f46688ccc) |
360 working directory parent is obsolete! (0d3f46688ccc) |
364 $ mkcommit "obsol_d''" |
361 $ mkcommit "obsol_d''" |
|
362 created new head |
365 1 new orphan changesets |
363 1 new orphan changesets |
366 created new head |
|
367 $ hg debugobsolete `getid 7` `getid 8` |
364 $ hg debugobsolete `getid 7` `getid 8` |
368 obsoleted 1 changesets |
365 obsoleted 1 changesets |
369 $ cd ../other-new |
366 $ cd ../other-new |
370 $ hg up -q 3 |
367 $ hg up -q 3 |
371 $ hg pull ../local/ |
368 $ hg pull ../local/ |
426 $ mkcommit toto # 9 |
423 $ mkcommit toto # 9 |
427 created new head |
424 created new head |
428 $ hg id -n |
425 $ hg id -n |
429 9 |
426 9 |
430 $ hg debugobsolete `getid 0` `getid 9` |
427 $ hg debugobsolete `getid 0` `getid 9` |
431 1 new phase-divergent changesets |
|
432 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 |
428 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 |
433 # at core level the warning is not issued |
429 # at core level the warning is not issued |
434 # this is now a big issue now that we have bumped warning |
430 # this is now a big issue now that we have bumped warning |
435 $ qlog -r 'obsolete()' |
431 $ qlog -r 'obsolete()' |
436 3 |
432 3 |
486 $ hg up null -q # to be not based on 9 anymore |
482 $ hg up null -q # to be not based on 9 anymore |
487 |
483 |
488 check rebase compat |
484 check rebase compat |
489 |
485 |
490 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
486 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
491 * 8 - 159dfc9fa5d3 add obsol_d'' |
487 o 8 - 159dfc9fa5d3 add obsol_d'' |
492 | |
488 | |
493 | o 4 - 725c380fe99b add obsol_c' |
489 | o 4 - 725c380fe99b add obsol_c' |
494 | | |
490 | | |
495 x | 3 - 0d3f46688ccc add obsol_c |
491 x | 3 - 0d3f46688ccc add obsol_c |
496 |/ |
492 |/ |
500 |
496 |
501 |
497 |
502 $ hg log -G --template='{rev} - {node|short} {desc}\n' --hidden |
498 $ hg log -G --template='{rev} - {node|short} {desc}\n' --hidden |
503 x 9 - 83b5778897ad add toto |
499 x 9 - 83b5778897ad add toto |
504 |
500 |
505 * 8 - 159dfc9fa5d3 add obsol_d'' |
501 o 8 - 159dfc9fa5d3 add obsol_d'' |
506 | |
502 | |
507 | x 7 - 909a0fb57e5d add obsol_d' |
503 | x 7 - 909a0fb57e5d add obsol_d' |
508 |/ |
504 |/ |
509 | x 6 - 95de7fc6918d add obsol_d |
505 | x 6 - 95de7fc6918d add obsol_d |
510 |/ |
506 |/ |
534 $ hg up tip |
530 $ hg up tip |
535 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
531 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
536 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
532 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
537 @ 11 - 9468a5f5d8b2 add obsol_d'' |
533 @ 11 - 9468a5f5d8b2 add obsol_d'' |
538 | |
534 | |
539 * 10 - 2033b4e49474 add obsol_c |
535 o 10 - 2033b4e49474 add obsol_c |
540 | |
536 | |
541 * 4 - 725c380fe99b add obsol_c' |
537 o 4 - 725c380fe99b add obsol_c' |
542 | |
538 | |
543 o 1 - 7c3bad9141dc add b |
539 o 1 - 7c3bad9141dc add b |
544 | |
540 | |
545 o 0 - 1f0dee641bb7 add a |
541 o 0 - 1f0dee641bb7 add a |
546 |
542 |
555 adding manifests |
551 adding manifests |
556 adding file changes |
552 adding file changes |
557 added 2 changesets with 1 changes to [12] files (re) |
553 added 2 changesets with 1 changes to [12] files (re) |
558 3 new obsolescence markers |
554 3 new obsolescence markers |
559 obsoleted 1 changesets |
555 obsoleted 1 changesets |
560 2 new content-divergent changesets |
|
561 $ hg up -q 10 |
556 $ hg up -q 10 |
562 $ mkcommit "obsol_d'''" |
557 $ mkcommit "obsol_d'''" |
563 created new head |
558 created new head |
564 $ hg debugobsolete `getid 11` `getid 12` |
559 $ hg debugobsolete `getid 11` `getid 12` |
565 obsoleted 1 changesets |
560 obsoleted 1 changesets |
623 | parent: 10:2033b4e49474 |
618 | parent: 10:2033b4e49474 |
624 | user: test |
619 | user: test |
625 | date: Thu Jan 01 00:00:00 1970 +0000 |
620 | date: Thu Jan 01 00:00:00 1970 +0000 |
626 | summary: add f |
621 | summary: add f |
627 | |
622 | |
628 | * changeset: 12:6db5e282cb91 |
623 | o changeset: 12:6db5e282cb91 |
629 |/ parent: 10:2033b4e49474 |
624 |/ parent: 10:2033b4e49474 |
630 | user: test |
625 | user: test |
631 | date: Thu Jan 01 00:00:00 1970 +0000 |
626 | date: Thu Jan 01 00:00:00 1970 +0000 |
632 | instability: phase-divergent |
627 | instability: phase-divergent |
633 | summary: add obsol_d''' |
628 | summary: add obsol_d''' |
686 commit: (clean) |
681 commit: (clean) |
687 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
682 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
688 phases: 3 draft |
683 phases: 3 draft |
689 phase-divergent: 1 changesets |
684 phase-divergent: 1 changesets |
690 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
685 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
691 2 new content-divergent changesets |
|
692 $ hg log -r 'contentdivergent()' |
686 $ hg log -r 'contentdivergent()' |
693 changeset: 12:6db5e282cb91 |
687 changeset: 12:6db5e282cb91 |
694 parent: 10:2033b4e49474 |
688 parent: 10:2033b4e49474 |
695 user: test |
689 user: test |
696 date: Thu Jan 01 00:00:00 1970 +0000 |
690 date: Thu Jan 01 00:00:00 1970 +0000 |
705 instability: content-divergent |
699 instability: content-divergent |
706 summary: add obsolet_conflicting_d |
700 summary: add obsolet_conflicting_d |
707 |
701 |
708 |
702 |
709 $ hg up --hidden 3 -q |
703 $ hg up --hidden 3 -q |
710 updating to a hidden changeset 0d3f46688ccc |
|
711 (hidden revision '0d3f46688ccc' has diverged) |
|
712 working directory parent is obsolete! (0d3f46688ccc) |
704 working directory parent is obsolete! (0d3f46688ccc) |
713 $ hg evolve |
705 $ hg evolve |
714 parent is obsolete with multiple successors: |
706 parent is obsolete with multiple successors: |
715 [4] add obsol_c' |
707 [4] add obsol_c' |
716 [10] add obsol_c |
708 [10] add obsol_c |
725 |
717 |
726 |
718 |
727 Check import reports new unstable changeset: |
719 Check import reports new unstable changeset: |
728 |
720 |
729 $ hg up --hidden 2 |
721 $ hg up --hidden 2 |
730 updating to a hidden changeset 4538525df7e2 |
|
731 (hidden revision '4538525df7e2' has diverged) |
|
732 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
722 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
733 working directory parent is obsolete! (4538525df7e2) |
723 working directory parent is obsolete! (4538525df7e2) |
734 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
724 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
735 $ hg export 9468a5f5d8b2 | hg import - |
725 $ hg export 9468a5f5d8b2 | hg import - |
736 applying patch from stdin |
726 applying patch from stdin |
747 | user: test |
737 | user: test |
748 | date: Thu Jan 01 00:00:00 1970 +0000 |
738 | date: Thu Jan 01 00:00:00 1970 +0000 |
749 | instability: orphan |
739 | instability: orphan |
750 | summary: add obsol_d'' |
740 | summary: add obsol_d'' |
751 | |
741 | |
752 | * changeset: 15:50f11e5e3a63 |
742 | o changeset: 15:50f11e5e3a63 |
753 | | parent: 11:9468a5f5d8b2 |
743 | | parent: 11:9468a5f5d8b2 |
754 | | user: test |
744 | | user: test |
755 | | date: Thu Jan 01 00:00:00 1970 +0000 |
745 | | date: Thu Jan 01 00:00:00 1970 +0000 |
756 | | instability: content-divergent |
746 | | instability: content-divergent |
757 | | summary: add obsolet_conflicting_d |
747 | | summary: add obsolet_conflicting_d |
767 | | | user: test |
757 | | | user: test |
768 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
758 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
769 | | | obsolete: amended using amend as 14:705ab2a6b72e |
759 | | | obsolete: amended using amend as 14:705ab2a6b72e |
770 | | | summary: add f |
760 | | | summary: add f |
771 | | | |
761 | | | |
772 | | | * changeset: 12:6db5e282cb91 |
762 | | | o changeset: 12:6db5e282cb91 |
773 | | |/ parent: 10:2033b4e49474 |
763 | | |/ parent: 10:2033b4e49474 |
774 | | | user: test |
764 | | | user: test |
775 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
765 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
776 | | | instability: phase-divergent, content-divergent |
766 | | | instability: phase-divergent, content-divergent |
777 | | | summary: add obsol_d''' |
767 | | | summary: add obsol_d''' |