equal
deleted
inserted
replaced
749 Empty commit |
749 Empty commit |
750 $ hg amend |
750 $ hg amend |
751 nothing changed |
751 nothing changed |
752 [1] |
752 [1] |
753 |
753 |
|
754 Check that the behavior of rebase with obsolescence markers is maintained |
|
755 despite inhibit |
|
756 |
|
757 $ hg up a438c045eb37 |
|
758 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
759 $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True |
|
760 note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM" |
|
761 rebasing 16:a438c045eb37 "add cN" |
|
762 $ hg up 21 |
|
763 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
764 |
754 Directaccess should load after some extensions precised in the conf |
765 Directaccess should load after some extensions precised in the conf |
755 With no extension specified: |
766 With no extension specified: |
756 |
767 |
757 $ cat >$TESTTMP/test_extension.py << EOF |
768 $ cat >$TESTTMP/test_extension.py << EOF |
758 > from mercurial import extensions |
769 > from mercurial import extensions |
763 > [extensions] |
774 > [extensions] |
764 > testextension=$TESTTMP/test_extension.py |
775 > testextension=$TESTTMP/test_extension.py |
765 > EOF |
776 > EOF |
766 $ hg id |
777 $ hg id |
767 ['rebase', 'strip', 'evolve', 'directaccess', 'inhibit', 'testextension'] |
778 ['rebase', 'strip', 'evolve', 'directaccess', 'inhibit', 'testextension'] |
768 721c3c279519 tip |
779 721c3c279519 |
769 |
780 |
770 With test_extension specified: |
781 With test_extension specified: |
771 $ cat >> $HGRCPATH << EOF |
782 $ cat >> $HGRCPATH << EOF |
772 > [directaccess] |
783 > [directaccess] |
773 > loadsafter=testextension |
784 > loadsafter=testextension |
774 > EOF |
785 > EOF |
775 $ hg id |
786 $ hg id |
776 ['rebase', 'strip', 'evolve', 'inhibit', 'testextension', 'directaccess'] |
787 ['rebase', 'strip', 'evolve', 'inhibit', 'testextension', 'directaccess'] |
777 721c3c279519 tip |
788 721c3c279519 |
778 |
789 |
779 Inhibit should not work without directaccess |
790 Inhibit should not work without directaccess |
780 $ cat >> $HGRCPATH <<EOF |
791 $ cat >> $HGRCPATH <<EOF |
781 > [extensions] |
792 > [extensions] |
782 > directaccess=! |
793 > directaccess=! |
795 |
806 |
796 $ cp -r inhibit inhibit2 |
807 $ cp -r inhibit inhibit2 |
797 $ pwd=$(pwd) |
808 $ pwd=$(pwd) |
798 $ cd inhibit |
809 $ cd inhibit |
799 $ mkcommit pk |
810 $ mkcommit pk |
|
811 created new head |
800 $ hg id |
812 $ hg id |
801 003a4735afde tip |
813 003a4735afde tip |
802 $ echo "OO" > pk |
814 $ echo "OO" > pk |
803 $ hg amend |
815 $ hg amend |
804 $ hg id |
816 $ hg id |
816 pushing to $TESTTMP/inhibit2 |
828 pushing to $TESTTMP/inhibit2 |
817 searching for changes |
829 searching for changes |
818 adding changesets |
830 adding changesets |
819 adding manifests |
831 adding manifests |
820 adding file changes |
832 adding file changes |
821 added 1 changesets with 1 changes to 1 files |
833 added 1 changesets with 1 changes to 1 files (+1 heads) |
822 2 new obsolescence markers |
834 2 new obsolescence markers |
823 |
835 |
824 Pulling from a inhibit repo to a non-inhibit repo should work |
836 Pulling from a inhibit repo to a non-inhibit repo should work |
825 |
837 |
826 $ cd .. |
838 $ cd .. |