Mercurial > evolve
comparison tests/test-amend.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 |
|---|---|
| 129 phases: 3 draft | 129 phases: 3 draft |
| 130 | 130 |
| 131 setting the user after we have performed the test with no username | 131 setting the user after we have performed the test with no username |
| 132 $ HGUSER=test | 132 $ HGUSER=test |
| 133 | 133 |
| 134 #if hg69 | |
| 134 Check the help | 135 Check the help |
| 135 $ hg amend -h | 136 $ hg amend -h |
| 136 hg amend [OPTION]... [FILE]... | 137 hg amend [OPTION]... [FILE]... |
| 137 | 138 |
| 138 aliases: refresh | 139 aliases: refresh |
| 139 | 140 |
| 140 combine a changeset with updates and replace it with a new one | 141 combine a changeset with updates and replace it with a new one |
| 141 | 142 |
| 142 Commits a new changeset incorporating both the changes to the given files | 143 Commits a new changeset incorporating both the changes to the given files and |
| 143 and all the changes from the current parent changeset into the repository. | 144 all the changes from the current parent changeset into the repository. |
| 144 | 145 |
| 145 See 'hg commit' for details about committing changes. | 146 See 'hg commit' for details about committing changes. |
| 146 | 147 |
| 147 If you don't specify -m, the parent's message will be reused. | 148 If you don't specify -m, the parent's message will be reused. |
| 148 | 149 |
| 149 If --extract is specified, the behavior of 'hg amend' is reversed: Changes | 150 If --extract is specified, the behavior of 'hg amend' is reversed: Changes to |
| 150 to selected files in the checked out revision appear again as uncommitted | 151 selected files in the checked out revision appear again as uncommitted changed |
| 151 changed in the working directory. | 152 in the working directory. |
| 152 | 153 |
| 153 Returns 0 on success, 1 if nothing changed. | 154 Returns 0 on success, 1 if nothing changed. |
| 154 | 155 |
| 155 options ([+] can be repeated): | 156 options ([+] can be repeated): |
| 156 | 157 |
| 157 -A --addremove mark new/missing files as added/removed before | 158 -A --addremove mark new/missing files as added/removed before |
| 158 committing | 159 committing |
| 173 -D --current-date record the current date as commit date | 174 -D --current-date record the current date as commit date |
| 174 -U --current-user record the current user as committer | 175 -U --current-user record the current user as committer |
| 175 -i --interactive use interactive mode | 176 -i --interactive use interactive mode |
| 176 | 177 |
| 177 (some details hidden, use --verbose to show complete help) | 178 (some details hidden, use --verbose to show complete help) |
| 179 #endif | |
| 178 | 180 |
| 179 Check that we abort if --patch and --extract both are used at once | 181 Check that we abort if --patch and --extract both are used at once |
| 180 $ hg amend --patch --extract | 182 $ hg amend --patch --extract |
| 181 abort: cannot use both --patch and --extract | 183 abort: cannot use both --patch and --extract |
| 182 [255] | 184 [255] |