https://bz.mercurial-scm.org/show_bug.cgi?id=6098
Bug ID: 6098 Summary: evolve of merge with pruned parents results in merge with both parents same Product: Mercurial Version: 4.7.2 Hardware: PC OS: Mac OS Status: UNCONFIRMED Severity: bug Priority: wish Component: evolution Assignee: bugzi...@mercurial-scm.org Reporter: martinv...@google.com CC: mercurial-devel@mercurial-scm.org, pierre-yves.da...@ens-lyon.org This test case (applied to f109917f) shows the problem: diff --git a/tests/test-evolve-orphan-merge.t b/tests/test-evolve-orphan-merge.t --- a/tests/test-evolve-orphan-merge.t +++ b/tests/test-evolve-orphan-merge.t @@ -537,6 +537,8 @@ point where the other parent of merge is | () draft o 0:8fa14d15e168 added hgignore () draft + $ hg debugindex -c | tail -n 1 + 29 29 b61ba77b924a 8fa14d15e168 8fa14d15e168 7) When one parent is pruned without successor and has no parent ---------------------------------------------------------------- -- 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