Mercurial > evolve

diff tests/test-evolve-content-divergent-relocation.t @ 5513:a8c21707e9c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add test to show broken --continue case of content divergence This test case demonstrates that during the resolution of content divergence which includes relocation of "divergent" side but not "other" and results in merge conflict during relocation, we can lose some changes. Next patch will fix this bug.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 05 Aug 2020 00:16:26 +0530
parents e8660b28bfee
children 011b53a9d03c d7d954b6d518
line wrap: on
line diff