https://bz.mercurial-scm.org/show_bug.cgi?id=6141
Bug ID: 6141 Summary: Evolving a merge switches parents Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: m...@manueljacob.de CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org At the end you can see that the parents of changeset 'merge' are switched. % hg init && touch test1 test2 && hg add test1 test2 && hg ci -m base && echo a > test1 && hg ci -m left && hg up 0 && echo b > test2 && hg ci -m right && hg up 1 && hg merge 2 && hg ci -m merge created new head (consider using topic for lightweight branches. See 'hg help topic') 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % hg log -G @ changeset: 3:6d4b04b82efe |\ tag: tip | | parent: 1:1dce335b603a | | parent: 2:611e09cde543 | | user: test | | date: Fri May 17 20:08:34 2019 +0200 | | summary: merge | | | o changeset: 2:611e09cde543 | | parent: 0:48bd97148639 | | user: test | | date: Fri May 17 20:08:34 2019 +0200 | | summary: right | | o | changeset: 1:1dce335b603a |/ user: test | date: Fri May 17 20:08:33 2019 +0200 | summary: left | o changeset: 0:48bd97148639 user: test date: Fri May 17 20:08:33 2019 +0200 summary: base % hg up 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % echo c > test2 % hg amend 1 new orphan changesets % hg evolve move:[3] merge atop:[4] right working directory is now at 4768cda43c54 % hg log -G @ changeset: 5:4768cda43c54 |\ tag: tip | | parent: 4:e693f496e70e | | parent: 1:1dce335b603a | | user: test | | date: Fri May 17 20:08:34 2019 +0200 | | summary: merge | | | o changeset: 4:e693f496e70e | | parent: 0:48bd97148639 | | user: test | | date: Fri May 17 20:08:34 2019 +0200 | | summary: right | | o | changeset: 1:1dce335b603a |/ user: test | date: Fri May 17 20:08:33 2019 +0200 | summary: left | o changeset: 0:48bd97148639 user: test date: Fri May 17 20:08:33 2019 +0200 summary: base -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel