Mercurial > evolve
comparison CHANGELOG @ 4692:a9cf0ba6e6c7 stable
pick: register pickstate as an unfinished state
This way pickstate file will indicate that unfinished pick command needs to be
dealt with (--continue or --abort) before modifying the repo. Otherwise it
would be e.g. possible to commit during an interrupted pick and that's not
expected.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 14 Jun 2019 18:17:03 +0800 |
| parents | 27947b17cfaf |
| children | fcecbb1261f2 |
comparison
equal
deleted
inserted
replaced
| 4691:214dab733124 | 4692:a9cf0ba6e6c7 |
|---|---|
| 3 | 3 |
| 4 9.0.1 - in progress | 4 9.0.1 - in progress |
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * pick: no longer forget file in case of conflict (issue6037) | 7 * pick: no longer forget file in case of conflict (issue6037) |
| 8 * pick: properly report and cleanup "unfinished state" | |
| 8 * evolve: properly prune changeset with no change in case of conflict (issue5967) | 9 * evolve: properly prune changeset with no change in case of conflict (issue5967) |
| 9 | 10 |
| 10 9.0.0 -- 2019-06-06 | 11 9.0.0 -- 2019-06-06 |
| 11 ------------------- | 12 ------------------- |
| 12 | 13 |