diff tests/test-obsolete.t @ 3790:5b9e3aaa6da8

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 1e103c7f7663
children f7afd3a158e3 ef22eef37ecc
line wrap: on
line diff