Mercurial > evolve

annotate debian/compat @ 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 b18b00036355
children 43e9bb4de6b5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
1 8