Mercurial > evolve

annotate debian/compat @ 3623:71fbb679e311

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: use the new rebased changeset to resolve phase-divergence When there is a parent change in phase-divergence, `hg evolve` first rebases the diveregent changeset on parent of public changeset and then continue the resolution of phase-divergence *but* we used to continue with the old divergent changeset rather than the new rebased one. This patch makes sure we use the new rebased changeset to proceed with the resolution. Tests changes shows that it fixes things which were broken earlier.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 23 Mar 2018 17:46:46 +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