Mercurial > evolve

annotate debian/docs @ 5787:32c0b2899fc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: [patch 2] fix a messed up test case Because of logic change in divergence resolution which causes the order change in picking the resolution parent this test case was messed up. It was supposed to test that that it hits conflict while relocating the divergent cset but because of some change in previous patches, relocation went successful and it hits conflict while merging the two divergent csets. This patch, by making some changes in files content make sure that we get conflict during relocation.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Jan 2021 20:09:02 +0530
parents 9e0f91cb5242
children
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 html
5404
9e0f91cb5242 evolve: the rest of b3e178f3e31f
Anton Shestakov <av6@dwimlabs.net>
parents: 1103
diff changeset
2 README.rst