Show More
@@ -770,6 +770,56 def histedit(ui, repo, *freeargs, **opts | |||||
770 | such ambiguous situation. See :hg:`help revsets` for detail about |
|
770 | such ambiguous situation. See :hg:`help revsets` for detail about | |
771 | selecting revisions. |
|
771 | selecting revisions. | |
772 |
|
772 | |||
|
773 | .. container:: verbose | |||
|
774 | ||||
|
775 | Examples: | |||
|
776 | ||||
|
777 | - A number of changes have been made. | |||
|
778 | Revision 3 is no longer needed. | |||
|
779 | ||||
|
780 | Start history editing from revision 3:: | |||
|
781 | ||||
|
782 | hg histedit -r 3 | |||
|
783 | ||||
|
784 | An editor opens, containing the list of revisions, | |||
|
785 | with specific actions specified:: | |||
|
786 | ||||
|
787 | pick 5339bf82f0ca 3 Zworgle the foobar | |||
|
788 | pick 8ef592ce7cc4 4 Bedazzle the zerlog | |||
|
789 | pick 0a9639fcda9d 5 Morgify the cromulancy | |||
|
790 | ||||
|
791 | Additional information about the possible actions | |||
|
792 | to take appears below the list of revisions. | |||
|
793 | ||||
|
794 | To remove revision 3 from the history, | |||
|
795 | its action (at the beginning of the relevant line) | |||
|
796 | is changed to 'drop':: | |||
|
797 | ||||
|
798 | drop 5339bf82f0ca 3 Zworgle the foobar | |||
|
799 | pick 8ef592ce7cc4 4 Bedazzle the zerlog | |||
|
800 | pick 0a9639fcda9d 5 Morgify the cromulancy | |||
|
801 | ||||
|
802 | - A number of changes have been made. | |||
|
803 | Revision 2 and 4 need to be swapped. | |||
|
804 | ||||
|
805 | Start history editing from revision 2:: | |||
|
806 | ||||
|
807 | hg histedit -r 2 | |||
|
808 | ||||
|
809 | An editor opens, containing the list of revisions, | |||
|
810 | with specific actions specified:: | |||
|
811 | ||||
|
812 | pick 252a1af424ad 2 Blorb a morgwazzle | |||
|
813 | pick 5339bf82f0ca 3 Zworgle the foobar | |||
|
814 | pick 8ef592ce7cc4 4 Bedazzle the zerlog | |||
|
815 | ||||
|
816 | To swap revision 2 and 4, its lines are swapped | |||
|
817 | in the editor:: | |||
|
818 | ||||
|
819 | pick 8ef592ce7cc4 4 Bedazzle the zerlog | |||
|
820 | pick 5339bf82f0ca 3 Zworgle the foobar | |||
|
821 | pick 252a1af424ad 2 Blorb a morgwazzle | |||
|
822 | ||||
773 | Returns 0 on success, 1 if user intervention is required (not only |
|
823 | Returns 0 on success, 1 if user intervention is required (not only | |
774 | for intentional "edit" command, but also for resolving unexpected |
|
824 | for intentional "edit" command, but also for resolving unexpected | |
775 | conflicts). |
|
825 | conflicts). |
General Comments 0
You need to be logged in to leave comments.
Login now