Mercurial > evolve
comparison CHANGELOG @ 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 | 116cdd8c102a |
| children | b89108d3eca0 |
comparison
equal
deleted
inserted
replaced
| 3789:13eef43a961f | 3790:5b9e3aaa6da8 |
|---|---|
| 1 Changelog | 1 Changelog |
| 2 ========= | 2 ========= |
| 3 | |
| 4 8.1.0 - in progress | |
| 5 ------------------- | |
| 6 | |
| 7 * evolve: handle branch changes when solving content divergence, | |
| 3 | 8 |
| 4 8.0.0 -- 2018-04-25 | 9 8.0.0 -- 2018-04-25 |
| 5 ------------------- | 10 ------------------- |
| 6 | 11 |
| 7 * evolve: a new `--abort` flag which aborts an interrupted evolve | 12 * evolve: a new `--abort` flag which aborts an interrupted evolve |