Mercurial > evolve

diff CHANGELOG @ 4692:a9cf0ba6e6c7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/CHANGELOG	Fri Jun 14 18:14:57 2019 +0800
+++ b/CHANGELOG	Fri Jun 14 18:17:03 2019 +0800
@@ -5,6 +5,7 @@
 -------------------
 
   * pick: no longer forget file in case of conflict (issue6037)
+  * pick: properly report and cleanup "unfinished state"
   * evolve: properly prune changeset with no change in case of conflict (issue5967)
 
 9.0.0 -- 2019-06-06