Mercurial > evolve
view debian/test-blacklist @ 3823:7b33a6ed0539
tests: add test for --stop flag when resolving multiparents content-div
This patch adds a test for --stop flag when we are in an interrupted
content-divergent resolution which have multiple parents. Conflicts happen we
merge the divergent changesets after relocation. The test shows that we
need to strip the relocated changeset.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 10 Jun 2018 22:38:08 +0530 |
parents | 54f75dc48887 |
children | 00bcca246403 |
line wrap: on
line source
test-drop.t test-inhibit.t test-simple4server.t tests/test-simple4server-bundle2.t