Mercurial > evolve

annotate debian/test-blacklist @ 3823:7b33a6ed0539

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1165
f0978cb993a0 debian: blacklist test-drop
Julien Cristau <julien.cristau@logilab.fr>
parents:
diff changeset
1 test-drop.t
1581
54f75dc48887 debian: blacklist test-inhibit.t
Laurent Charignon <lcharignon@fb.com>
parents: 1166
diff changeset
2 test-inhibit.t
1166
30b478854260 debian: blacklist simple4server tests
Julien Cristau <julien.cristau@logilab.fr>
parents: 1165
diff changeset
3 test-simple4server.t
30b478854260 debian: blacklist simple4server tests
Julien Cristau <julien.cristau@logilab.fr>
parents: 1165
diff changeset
4 tests/test-simple4server-bundle2.t