Mercurial > evolve
comparison tests/test-tutorial.t @ 6936:a239ea1dfacb default tip
branching: merge with stable
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 22 Nov 2024 16:53:42 +0400 |
| parents | 237f99ee3d64 |
| children |
comparison
equal
deleted
inserted
replaced
| 6928:361dcfcb3f08 | 6936:a239ea1dfacb |
|---|---|
| 908 ------------------ | 908 ------------------ |
| 909 | 909 |
| 910 This part is not written yet, but you can use either the `histedit` extension | 910 This part is not written yet, but you can use either the `histedit` extension |
| 911 or the `uncommit` command to split a change. | 911 or the `uncommit` command to split a change. |
| 912 | 912 |
| 913 #if hg69 | |
| 913 $ hg help uncommit | 914 $ hg help uncommit |
| 914 hg uncommit [OPTION]... [FILE]... | 915 hg uncommit [OPTION]... [FILE]... |
| 915 | 916 |
| 916 move changes from parent revision to working directory | 917 move changes from parent revision to working directory |
| 917 | 918 |
| 918 Changes to selected files in the checked out revision appear again as | 919 Changes to selected files in the checked out revision appear again as |
| 919 uncommitted changed in the working directory. A new revision without the | 920 uncommitted changed in the working directory. A new revision without the |
| 920 selected changes is created, becomes the checked out revision, and | 921 selected changes is created, becomes the checked out revision, and obsoletes |
| 921 obsoletes the previous one. | 922 the previous one. |
| 922 | 923 |
| 923 The --include option specifies patterns to uncommit. The --exclude option | 924 The --include option specifies patterns to uncommit. The --exclude option |
| 924 specifies patterns to keep in the commit. | 925 specifies patterns to keep in the commit. |
| 925 | 926 |
| 926 The --rev argument let you change the commit file to a content of another | 927 The --rev argument let you change the commit file to a content of another |
| 927 revision. It still does not change the content of your file in the working | 928 revision. It still does not change the content of your file in the working |
| 928 directory. | 929 directory. |
| 929 | 930 |
| 930 Return 0 if changed files are uncommitted. | 931 Return 0 if changed files are uncommitted. |
| 931 | 932 |
| 932 options ([+] can be repeated): | 933 options ([+] can be repeated): |
| 933 | 934 |
| 934 -a --all uncommit all changes when no arguments given | 935 -a --all uncommit all changes when no arguments given |
| 935 -r --rev REV revert commit content to REV instead | 936 -r --rev REV revert commit content to REV instead |
| 943 -u --user USER record the specified user as committer | 944 -u --user USER record the specified user as committer |
| 944 -D --current-date record the current date as commit date | 945 -D --current-date record the current date as commit date |
| 945 -U --current-user record the current user as committer | 946 -U --current-user record the current user as committer |
| 946 | 947 |
| 947 (some details hidden, use --verbose to show complete help) | 948 (some details hidden, use --verbose to show complete help) |
| 949 #endif | |
| 948 | 950 |
| 949 | 951 |
| 950 The edit command of histedit can be used to split changeset: | 952 The edit command of histedit can be used to split changeset: |
| 951 | 953 |
| 952 | 954 |
| 953 Collapsing change | 955 Collapsing change |
| 954 ------------------ | 956 ------------------ |
| 955 | 957 |
| 956 The tutorial part is not written yet but can use `hg fold`: | 958 The tutorial part is not written yet but can use `hg fold`: |
| 957 | 959 |
| 960 #if hg69 | |
| 958 $ hg help fold | 961 $ hg help fold |
| 959 hg fold [OPTION]... [-r] REV... | 962 hg fold [OPTION]... [-r] REV... |
| 960 | 963 |
| 961 aliases: squash | 964 aliases: squash |
| 962 | 965 |
| 963 fold multiple revisions into a single one | 966 fold multiple revisions into a single one |
| 964 | 967 |
| 965 With --from, folds all the revisions linearly between the given revisions | 968 With --from, folds all the revisions linearly between the given revisions and |
| 966 and the parent of the working directory. | 969 the parent of the working directory. |
| 967 | 970 |
| 968 With --exact, folds only the specified revisions while ignoring the parent | 971 With --exact, folds only the specified revisions while ignoring the parent of |
| 969 of the working directory. In this case, the given revisions must form a | 972 the working directory. In this case, the given revisions must form a linear |
| 970 linear unbroken chain. | 973 unbroken chain. |
| 971 | 974 |
| 972 options ([+] can be repeated): | 975 options ([+] can be repeated): |
| 973 | 976 |
| 974 -r --rev REV [+] revision to fold | 977 -r --rev REV [+] revision to fold |
| 975 --exact only fold specified revisions | 978 --exact only fold specified revisions |
| 981 -u --user USER record the specified user as committer | 984 -u --user USER record the specified user as committer |
| 982 -D --current-date record the current date as commit date | 985 -D --current-date record the current date as commit date |
| 983 -U --current-user record the current user as committer | 986 -U --current-user record the current user as committer |
| 984 | 987 |
| 985 (some details hidden, use --verbose to show complete help) | 988 (some details hidden, use --verbose to show complete help) |
| 989 #endif | |
| 986 | 990 |
| 987 | 991 |
| 988 ----------------------- | 992 ----------------------- |
| 989 Collaboration | 993 Collaboration |
| 990 ----------------------- | 994 ----------------------- |