Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: update with issue5927 fix stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 20 Aug 2018 23:04:37 +0200
branchstable
changeset 3979 db44da7b9097
parent 3978 fb8e44c70798
child 3980 828b423545b1
changelog: update with issue5927 fix
CHANGELOG file | annotate | diff | comparison | revisions 
--- a/CHANGELOG	Sat Aug 18 21:03:45 2018 +0530
+++ b/CHANGELOG	Mon Aug 20 23:04:37 2018 +0200
@@ -4,6 +4,7 @@
 8.1.1 - in progress
 -------------------
 
+  * evolve: properly set second parent during conflict (issue5927)
   * next: fix topic restriction when passing --evolve
   * clone: fix possible crash when using clone bundle and forcing cache warming
   * obshashrange: fix speed and consistency issues during cache invalidation
evolve