Mercurial > evolve
comparison tests/test-fixup.t @ 6931:237f99ee3d64 stable
tests: remove leading spaces in `hg help` output, run only on Mercurial 6.9+
Core decided to remove a lot of leading spaces in docstrings to support Python
3.13, see 51057ab0dffa for details.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 11 Nov 2024 10:39:57 +0400 |
| parents | d0f0a7b68d2d |
| children |
comparison
equal
deleted
inserted
replaced
| 6930:195941260a67 | 6931:237f99ee3d64 |
|---|---|
| 10 > evolve = | 10 > evolve = |
| 11 > [diff] | 11 > [diff] |
| 12 > git = 1 | 12 > git = 1 |
| 13 > EOF | 13 > EOF |
| 14 | 14 |
| 15 #if hg69 | |
| 15 $ hg help fixup | 16 $ hg help fixup |
| 16 hg fixup [OPTION]... [-r] REV | 17 hg fixup [OPTION]... [-r] REV |
| 17 | 18 |
| 18 aliases: fix-up | 19 aliases: fix-up |
| 19 | 20 |
| 20 add working directory changes to an arbitrary revision | 21 add working directory changes to an arbitrary revision |
| 21 | 22 |
| 22 A new changeset will be created, superseding the one specified. The new | 23 A new changeset will be created, superseding the one specified. The new |
| 23 changeset will combine working directory changes with the changes in the | 24 changeset will combine working directory changes with the changes in the |
| 24 target revision. | 25 target revision. |
| 25 | 26 |
| 26 This operation requires the working directory changes to be relocated onto | 27 This operation requires the working directory changes to be relocated onto the |
| 27 the target revision, which might result in merge conflicts. | 28 target revision, which might result in merge conflicts. |
| 28 | 29 |
| 29 If fixup is interrupted to manually resolve a conflict, it can be | 30 If fixup is interrupted to manually resolve a conflict, it can be continued |
| 30 continued with --continue/-c, or aborted with --abort. | 31 with --continue/-c, or aborted with --abort. |
| 31 | 32 |
| 32 Note that this command is fairly new and its behavior is still | 33 Note that this command is fairly new and its behavior is still experimental. |
| 33 experimental. For example, the working copy will be left on a temporary, | 34 For example, the working copy will be left on a temporary, obsolete commit |
| 34 obsolete commit containing the fixed-up changes after the operation. This | 35 containing the fixed-up changes after the operation. This might change in the |
| 35 might change in the future. | 36 future. |
| 36 | 37 |
| 37 Returns 0 on success, 1 if nothing changed. | 38 Returns 0 on success, 1 if nothing changed. |
| 38 | 39 |
| 39 options: | 40 options: |
| 40 | 41 |
| 41 -r --rev REV revision to amend | 42 -r --rev REV revision to amend |
| 42 -c --continue continue an interrupted fixup | 43 -c --continue continue an interrupted fixup |
| 43 --abort abort an interrupted fixup | 44 --abort abort an interrupted fixup |
| 44 | 45 |
| 45 (some details hidden, use --verbose to show complete help) | 46 (some details hidden, use --verbose to show complete help) |
| 47 #endif | |
| 46 | 48 |
| 47 Simple cases | 49 Simple cases |
| 48 ------------ | 50 ------------ |
| 49 | 51 |
| 50 $ hg init simple | 52 $ hg init simple |