[Bug 6157] New: Incorrect amend behaviour with partial amend
mercurial-bugs at mercurial-scm.org
mercurial-bugs at mercurial-scm.org
Wed Jun 19 02:21:04 UTC 2019
https://bz.mercurial-scm.org/show_bug.cgi?id=6157
Bug ID: 6157
Summary: Incorrect amend behaviour with partial amend
Product: Mercurial
Version: 5.0
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: Mercurial
Assignee: bugzilla at mercurial-scm.org
Reporter: mathias.demare at gmail.com
CC: mercurial-devel at mercurial-scm.org
We're seeing this behaviour both on 5.0 and 5.0.1:
### PREP
$ hg init
$ echo bad > life
$ echo bad > real_life
$ hg add .
$ hg commit -m "create life"
$ echo 42 > life
$ hg commit -m "make life better"
### DO SOME STUFF ###
# Trying to change previous commit to correct real_life in addition to life
# But also have changes ready to commit to make life bad again
$ echo bad > life
$ echo 42 > real_life
$ hg commit --amend real_life
# commit overview shows only real_life is changed in 'make life better' commit
### WEIRD SITUATION AFTER
$ hg diff
<empty>
$ hg st
M life
$ hg commit -m "an empty commit"
$ hg diff -c .
<empty>
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list