Mercurial > hg
comparison tests/test-backout.t @ 45812:976b26bdd0d8
commit: warn the user when a commit already exists
Sometimes, a commit will result in an exact match of a preexisting
commit, and if that commit isn't a branch head, hg will incorrectly
note that it created a new head. Instead, we should warn the user that
commit already existed in the repository.
In practice, this bug is rather uncommon, and will only occur when the
usr explicitly sets the date.
Please note that this commit contains an API change to
cmdutil.commitstatus()
Differential Revision: https://phab.mercurial-scm.org/D9257
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Thu, 29 Oct 2020 13:54:25 +0100 |
| parents | e0ad11ab8052 |
| children | 8d72e29ad1e0 |
comparison
equal
deleted
inserted
replaced
| 45811:4404f129341e | 45812:976b26bdd0d8 |
|---|---|
| 817 adding 4 | 817 adding 4 |
| 818 $ hg up 2 | 818 $ hg up 2 |
| 819 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 819 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 820 $ hg backout 2 | 820 $ hg backout 2 |
| 821 removing 3 | 821 removing 3 |
| 822 created new head | 822 warning: commit already existed in the repository! |
| 823 changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f | 823 changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f |