Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D11009
tests: demonstrate crash when common predecessor of divergence is hiddenClosedPublic
tests: demonstrate crash when common predecessor of divergence is hidden
ClosedPublic
Authored by martinvonz on Jul 7 2021, 2:22 PM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-amend.t (26 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
Diff 28977
Diff 28977
tests/test-amend.t
| abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd | abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd | ||||
| changeset 112478962961 already has a successor in changeset 16084da537dd | changeset 112478962961 already has a successor in changeset 16084da537dd | ||||
| rewriting changeset 112478962961 would create "content-divergence" | rewriting changeset 112478962961 would create "content-divergence" | ||||
| set experimental.evolution.allowdivergence=True to skip this check | set experimental.evolution.allowdivergence=True to skip this check | ||||
| (see 'hg help evolution.instability' for details on content-divergence) | (see 'hg help evolution.instability' for details on content-divergence) | ||||
| [10] | [10] | ||||
| $ hg amend -m divergent --config experimental.evolution.allowdivergence=true | $ hg amend -m divergent --config experimental.evolution.allowdivergence=true | ||||
| 2 new content-divergent changesets | 2 new content-divergent changesets | ||||
| Hidden common predecessor of divergence does not cause crash | |||||
| First create C1 as a pruned successor of C | |||||
| $ hg co C | |||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ hg amend -m C1 | |||||
| $ hg tag --local C1 | |||||
| $ hg debugobsolete $(hg log -T '{node}' -r C1) | |||||
| 1 new obsolescence markers | |||||
| obsoleted 1 changesets | |||||
| Now create C2 as other side of divergence (not actually divergent because C1 is | |||||
| pruned) | |||||
| $ hg co C | |||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ hg amend -m C2 | |||||
| 1 new orphan changesets | |||||
| Make the common predecessor (C) pruned | |||||
| $ hg tag --local --remove C | |||||
| $ hg co C1 | |||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| Try to cause divergence | |||||
| $ hg amend -m C11 | |||||
| abort: filtered revision '26805aba1e600a82e93661149f2313866a221a7b' (known-bad-output !) | |||||
| [255] | |||||
| [10] | |||||
| #endif | #endif | ||||
| Cannot amend public changeset | Cannot amend public changeset | ||||
| $ hg phase -r A --public | $ hg phase -r A --public | ||||
| $ hg update -C -q A | $ hg update -C -q A | ||||
| $ hg amend -m AMEND | $ hg amend -m AMEND | ||||
| abort: cannot amend public changesets: 426bada5c675 | abort: cannot amend public changesets: 426bada5c675 | ||||