Mercurial > evolve
changeset 3571:34330381b76b
evolve: preserve the order of merge parents in `hg evolve --continue`
This patch makes sure we preserves the order of merge parents in case of `hg
evolve --continue`.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 19 Mar 2018 12:58:31 +0530 |
parents | 2477bcdd95ff |
children | 7934e9751d69 |
files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-orphan-merge.t |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Mon Mar 12 15:41:51 2018 -0700 +++ b/hgext3rd/evolve/evolvecmd.py Mon Mar 19 12:58:31 2018 +0530 @@ -1208,8 +1208,8 @@ # directory parent should be successor of p2, so we should # set dirstate parents to (succ of p2, p1) with repo.dirstate.parentchange(): - repo.dirstate.setparents(currentp1, - ctxparents[0].node()) + repo.dirstate.setparents(ctxparents[0].node(), + currentp1) else: # both the parents were obsolete, not sure what logic will
--- a/tests/test-evolve-orphan-merge.t Mon Mar 12 15:41:51 2018 -0700 +++ b/tests/test-evolve-orphan-merge.t Mon Mar 19 12:58:31 2018 +0530 @@ -245,8 +245,8 @@ $ hg parents changeset: 12:c5405d2da7a1 tag: tip + parent: 9:d0f84b25d4e3 parent: 11:31c317b7bdb1 - parent: 9:d0f84b25d4e3 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: foobar to c