This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10916

tests: add test case for issue 6262
ClosedPublic

Authored by martinvonz on Jun 29 2021, 5:20 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc8f8d2dba6c7: tests: add test case for issue 6262
rHG6765602a4e3d: tests: add test case for issue 6262
rHGf97fc3c6f7e4: tests: add test case for issue 6262
Summary

If you split a commit, prune one of the sides, and then try to revive
that commit by adding a successor, it will incorrectly be considered
divergence.

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.

Event Timeline

martinvonz created this revision.Jun 29 2021, 5:20 PM
Alphare accepted this revision.Jul 7 2021, 12:07 PM
This revision is now accepted and ready to land.Jul 7 2021, 12:07 PM
martinvonz removed a child revision: D10917: rewriteutil: look up common predecessor on unfiltered repo.Jul 7 2021, 2:22 PM
martinvonz added a parent revision: D10917: rewriteutil: look up common predecessor on unfiltered repo.
martinvonz retitled this revision from tests: demonstrate crash when trying to rewrite pruned part of a split to tests: add test case for issue 6262.
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 28946.
pulkit accepted this revision.Jul 8 2021, 4:06 AM
martinvonz added a commit: rHGf97fc3c6f7e4: tests: add test case for issue 6262.Jul 8 2021, 5:02 AM
Closed by commit rHGf97fc3c6f7e4: tests: add test case for issue 6262 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
Alphare added a comment.Jul 8 2021, 7:52 AM

I mistakenly amended this changeset, then fixed my issue. Sorry for the noise.

Revision Contents
Changeset List

PathPackages
Mtests/test-amend.t (37 lines)

Diff 28979

tests/test-amend.t

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
Amending pruned part of split commit does not cause divergence (issue6262)
$ hg debugobsolete $(hg log -T '{node}' -r .)
1 new obsolescence markers
obsoleted 1 changesets
$ hg co '.^'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ node_B=$(hg log -T '{node}' -r 4)
$ hg revert -r $node_B -a
adding B
adding bar
$ hg ci -m B-split1
created new head
$ node_B_split1=$(hg log -T '{node}' -r .)
$ hg co '.^'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg revert -r 4 -a
adding B
adding bar
$ hg ci -m B-split2
created new head
$ node_B_split2=$(hg log -T '{node}' -r .)
$ hg debugobsolete $node_B $node_B_split1 $node_B_split2
1 new obsolescence markers
obsoleted 1 changesets
$ hg debugobsolete $node_B_split2
1 new obsolescence markers
obsoleted 1 changesets
$ hg co --hidden $node_B_split2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg amend -m 'revived B-split2'
abort: cannot amend 809fe227532f, as that creates content-divergence with c68306a86921, from 16084da537dd (known-bad-output !)
(add --verbose for details or see 'hg help evolution.instability') (known-bad-output !)
[10]
Hidden common predecessor of divergence does not cause crash Hidden common predecessor of divergence does not cause crash
First create C1 as a pruned successor of C First create C1 as a pruned successor of C
$ hg co C $ hg co C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg amend -m C1 $ hg amend -m C1
$ hg tag --local C1 $ hg tag --local C1
$ hg debugobsolete $(hg log -T '{node}' -r C1) $ hg debugobsolete $(hg log -T '{node}' -r C1)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
Now create C2 as other side of divergence (not actually divergent because C1 is Now create C2 as other side of divergence (not actually divergent because C1 is
pruned) pruned)
$ hg co C $ hg co C