Mercurial > evolve
comparison tests/test-push-checkheads-unpushed-D3.t @ 3626:760210aa0d78
tests: add tests of content+parent change creating phase-divergence
This patch adds tests which shows handling of phase divergence cases by `hg
evolve` command which involved content+parent change. The conflicts case is not
handled and will be fixed in upcoming patches.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 23 Mar 2018 18:58:19 +0530 |
parents | 2e703ed1c713 |
children | d5adce52cef4 ef22eef37ecc |
comparison
equal
deleted
inserted
replaced
3625:7e253bbac9a1 | 3626:760210aa0d78 |
---|