Mercurial > evolve

diff CHANGELOG @ 3790:5b9e3aaa6da8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: prompt user for branch selection while resolving content-divergence When resolving content-divergence, there can be case when both the content-divergent changesets are on different named branches. In that case, we are not sure which branch should the resolution commit should be on. This patch adds logic to prompt user to choose the branch which the resolution commit should be on and then creates the new resolution commit on that branch. This also adds a new test file which have tests for the branch selection feature we have added.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 04 Jun 2018 04:03:02 +0530
parents 116cdd8c102a
children b89108d3eca0
line wrap: on
line diff
--- a/CHANGELOG	Tue Jun 05 03:51:01 2018 +0530
+++ b/CHANGELOG	Mon Jun 04 04:03:02 2018 +0530
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+8.1.0 - in progress
+-------------------
+
+  * evolve: handle branch changes when solving content divergence,
+
 8.0.0 -- 2018-04-25
 -------------------