I have a pair of commits that should really be just one. If I was using git, I would use:
git rebase -i
and then
Let's assume you want to squash (unite) 2 most recent commits.
Find a revision number
hg log -G -l 3
possible output:
@ changeset: 156:a922d923cf6f
| branch: default
| tag: tip
| user: naXa!
| date: Thu Dec 13 15:45:58 2018 +0300
| summary: commit message 3
|
o changeset: 155:5feb73422486
| branch: default
| user: naXa!
| date: Thu Dec 13 15:22:15 2018 +0300
| summary: commit message 2
|
o changeset: 154:2e490482bd75
| branch: default
~ user: naXa!
date: Thu Dec 13 03:28:27 2018 +0300
summary: commit message 1
Soft reset branch
hg strip --keep -r 155
Commit changes again
hg commit -m "new commit message"
strip requires a built-in extension to be enabled. Create/edit ~/.hgrc config file with the following content:
[extensions]
strip =