( )⚙ D12086 tests: demonstrate how `hg unamend` fails on merge commits

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12086

tests: demonstrate how `hg unamend` fails on merge commits
ClosedPublic

Authored by martinvonz on Jan 25 2022, 12:17 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf1898680d713: tests: demonstrate how `hg unamend` fails on merge commits
Summary

When hg unamend is run on a merge commit, it seems that it loses the
changes from the second parent.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 25 2022, 12:17 AM
Alphare added a subscriber: Alphare.Jan 25 2022, 4:45 AM

I feel like this should go to stable

Alphare accepted this revision.Jan 25 2022, 4:49 AM
This revision is now accepted and ready to land.Jan 25 2022, 4:49 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-unamend.t (27 lines)

Diff 31900

tests/test-unamend.t

$ hg st --copies --change . $ hg st --copies --change .
A b A b
a a
R a R a
$ hg st --copies $ hg st --copies
A d A d
b b
R b R b
Try to unamend a merge
$ cd ..
$ hg init merge
$ cd merge
$ echo initial > initial
$ hg ci -Aqm initial
$ echo left > left
$ hg ci -Aqm left
$ hg co -q 0
$ echo right > right
$ hg ci -Aqm right
$ hg merge -q 1
$ hg ci -m merge
$ echo accidental > initial
$ hg st --rev 1 --rev .
A right
$ hg st --rev 2 --rev .
A left
$ hg amend
$ hg unamend
$ hg st --rev 1 --rev .
A right
R left (known-bad-output !)
$ hg st --rev 2 --rev .
A left (missing-correct-output !)