debian/compat
author Pulkit Goyal <7895pulkit@gmail.com>
Tue, 13 Mar 2018 18:17:50 +0530
changeset 3529 d90e0faaec80
parent 531 b18b00036355
child 4912 43e9bb4de6b5
permissions -rw-r--r--
evolve: fix stabilization of orphan merge changesets in case of conflicts As demonstrated by tests added in previous patch, if one of the parent of a merge changeset has a new version and merge changeset gets, running `hg evolve` to stabilize that if results in conflicts will lead to lose of other parent of that merge changeset when we resolve conflicts and do `hg evolve --continue`. This patch fixes the behavior, by checking whether we are continuing evolving a merge changeset and if yes, setting the dirstate parents according to that.

8