Mercurial > evolve
comparison CHANGELOG @ 4724:77bf84025dd5
metaedit: allow operations on merge commits with some conditions
As with fold (see the previous patch), it's allowed to metaedit a merge commit
or a set of commits including merge commits (with --fold) as long as there are
less than 2 parents of the set not included in the said set.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 13 Jul 2019 18:22:34 +0800 |
| parents | 41885988921e |
| children | 076b6813a7ea |
comparison
equal
deleted
inserted
replaced
| 4723:41885988921e | 4724:77bf84025dd5 |
|---|---|
| 9 * evolve: improve `hg evolve --all` behavior when "." is obsolete | 9 * evolve: improve `hg evolve --all` behavior when "." is obsolete |
| 10 * topic: fix confusion in branch heads checking logic | 10 * topic: fix confusion in branch heads checking logic |
| 11 * touch: now works on merge commit too | 11 * touch: now works on merge commit too |
| 12 * rewind: fix behavior for merge commit | 12 * rewind: fix behavior for merge commit |
| 13 * fold: allow fold with merge commit | 13 * fold: allow fold with merge commit |
| 14 * metaedit: now also operates on merge commit | |
| 14 | 15 |
| 15 9.0.1 - in progress | 16 9.0.1 - in progress |
| 16 ------------------- | 17 ------------------- |
| 17 | 18 |
| 18 * pick: no longer forget file in case of conflict (issue6037) | 19 * pick: no longer forget file in case of conflict (issue6037) |