This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6666

amend: add a test for a simplified version of issue6157
ClosedPublic

Authored by valentin.gatienbaron on Jul 22 2019, 6:36 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG464aa857c717: amend: add a test for a simplified version of issue6157

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

valentin.gatienbaron added a commit: rHG464aa857c717: amend: add a test for a simplified version of issue6157.Jul 22 2019, 7:27 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG464aa857c717: amend: add a test for a simplified version of issue6157 (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 15990

tests/test-amend.t

Bad combination of date options: Bad combination of date options:
$ hg amend -D --date '0 0' $ hg amend -D --date '0 0'
abort: --date and --currentdate are mutually exclusive abort: --date and --currentdate are mutually exclusive
[255] [255]
$ cd .. $ cd ..
Corner case of amend from issue6157:
- working copy parent has a change to file `a`
- working copy has the inverse change
- we amend the working copy parent for files other than `a`
hg includes the changes to `a` anyway.
$ hg init 6157; cd 6157
$ echo a > a; echo b > b; hg commit -qAm_
$ echo a2 > a; hg commit -qm_
$ hg diff --stat -c .
a | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
$ echo a > a; echo b2 > b; hg amend -q b
$ hg diff --stat -c .
b | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)