Mercurial > evolve
comparison tests/test-tutorial.t @ 6887:45cbf0af48e7 stable
tests: update old changeset hashes in test-tutorial.t
They actually should've been updated in 32ed5b6fadd3, but better late than
never.
Unfortunately, these messages are not tied directly to any command output, so
the issue with using nonexistent hashes was not immediately obvious after
running this test.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 03 Oct 2024 09:34:56 +0400 |
parents | 2540c03e1bf2 |
children | 237f99ee3d64 |
comparison
equal
deleted
inserted
replaced
6886:2540c03e1bf2 | 6887:45cbf0af48e7 |
---|---|
1343 11 -> 13 [arrowhead=none, | 1343 11 -> 13 [arrowhead=none, |
1344 penwidth=2.0]; | 1344 penwidth=2.0]; |
1345 } | 1345 } |
1346 #endif | 1346 #endif |
1347 | 1347 |
1348 The older version 75954b8cd933 never ceased to exist in the local repo. It was | 1348 The older version 39b19dc3d1e4 never ceased to exist in the local repo. It was |
1349 just hidden and excluded from pull and push. | 1349 just hidden and excluded from pull and push. |
1350 | 1350 |
1351 .. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 75954b8cd933. This is not yet ported to ``hg log -G``. | 1351 .. note:: In hgview there is a nice dotted relation highlighting 5486682f4225 as a new version of 39b19dc3d1e4. This is not yet ported to ``hg log -G``. |
1352 | 1352 |
1353 There is now an **unstable** changeset in this history. Mercurial will refuse to | 1353 There is now an **unstable** changeset in this history. Mercurial will refuse to |
1354 share it with the outside: | 1354 share it with the outside: |
1355 | 1355 |
1356 $ hg push other | 1356 $ hg push other |
1359 abort: push includes orphan changeset: 0609f95eccab! | 1359 abort: push includes orphan changeset: 0609f95eccab! |
1360 (use 'hg evolve' to get a stable history or --force to ignore warnings) | 1360 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
1361 [255] | 1361 [255] |
1362 | 1362 |
1363 | 1363 |
1364 To resolve this unstable state, you need to rebase bf1b0d202029 onto | 1364 To resolve this unstable state, you need to rebase 0609f95eccab onto |
1365 a44c85f957d3. The `hg evolve` command will do this for you. | 1365 5486682f4225. The `hg evolve` command will do this for you. |
1366 | 1366 |
1367 It has a --dry-run option to only suggest the next move. | 1367 It has a --dry-run option to only suggest the next move. |
1368 | 1368 |
1369 $ hg evolve --dry-run | 1369 $ hg evolve --dry-run |
1370 move:[13] animals | 1370 move:[13] animals |