This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10267

tests: update divergence test for `hg fix` to actually result in divergence
ClosedPublic

Authored by martinvonz on Mar 25 2021, 6:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd083c12032c6: tests: update divergence test for `hg fix` to actually result in divergence
Summary

We have a test that checks that hg fix errors out if it might cause
divergence. However, the test simply prunes the commit it then tries
to fix, so fixing it wouldn't actually cause divergence. That works
because the implementation is simple enough that it doesn't notice the
difference. I'm about to make the implementation smarter, so let's fix
the test first.

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.Mar 25 2021, 6:13 PM
martinvonz added a commit: rHGd083c12032c6: tests: update divergence test for `hg fix` to actually result in divergence.Mar 29 2021, 3:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd083c12032c6: tests: update divergence test for `hg fix` to actually result in divergence (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-fix.t (5 lines)

Diff 26622

tests/test-fix.t

successor, but even then it is not likely intentional or idiomatic to fix an successor, but even then it is not likely intentional or idiomatic to fix an
obsolete revision. obsolete revision.
$ hg init abortobsoleterev $ hg init abortobsoleterev
$ cd abortobsoleterev $ cd abortobsoleterev
$ printf "foo\n" > foo.changed $ printf "foo\n" > foo.changed
$ hg commit -Aqm "foo" $ hg commit -Aqm "foo"
$ hg debugobsolete `hg parents --template '{node}'` $ hg ci --amend -m rewritten
1 new obsolescence markers
obsoleted 1 changesets
$ hg --hidden fix -r 0 $ hg --hidden fix -r 0
abort: fixing obsolete revision could cause divergence abort: fixing obsolete revision could cause divergence
[255] [255]
$ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true $ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true
2 new content-divergent changesets
$ hg cat -r tip foo.changed $ hg cat -r tip foo.changed
FOO FOO
$ cd .. $ cd ..
Test all of the available substitution values for fixer commands. Test all of the available substitution values for fixer commands.
$ hg init substitution $ hg init substitution