Mercurial > evolve
diff tests/test-evolve-orphan-merge.t @ 3632:8d38b88233cb
evolve: move logic to resolve phase-divergence in a new function
This patch moves logic which does the revert and create a commit on top of
public changeset because we need to repeat that logic while handling
continuation of `hg evolve` when there are conflicts while rebasing the
phase-divergent changeset.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 24 Mar 2018 16:41:14 +0530 |
| parents | d53277cdc1e7 |
| children | d5adce52cef4 f6979d64b9fb |