Mercurial > evolve

diff hgext3rd/serverminitopic.py @ 3628:170b99a9c0b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: write data to evolvestate in case on conflicts in phase-divergence This patch makes phase-divergence resolution write data to evolvestate instead of graftstate. The `evolve --continue` handling of phase-divergence is broken which will be done in upcoming patches.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 23 Mar 2018 19:36:08 +0530
parents d938808e31bc
children fa15068a9945
line wrap: on
line diff