Mercurial > evolve

comparison tests/testlib/push-checkheads-util.sh @ 3978:fb8e44c70798 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: set the second parent if we get conflicts while evolving This patch makes sure we set the second parent correctly if we run into conflicts while evolving. Also, we need to make sure to reset to one parent before committing.
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sat, 18 Aug 2018 21:03:45 +0530
parents 61d885899466
children 5a46f156c9b7
comparison
equal deleted inserted replaced
3977:a0a4f4de9ea3 3978:fb8e44c70798