relnotes/next
author Pierre-Yves David <pierre-yves.david@octobus.net>
Mon, 09 Sep 2019 17:32:21 +0200
branchstable
changeset 42676 a4ca0610c754
parent 42659 cba59b338976
child 42921 96b22e58dc67
permissions -rw-r--r--
merge: respect parents order when using `graft` on a merge The previous code did not record the index of the replaced parent. It was always using the "graft" destination as `p1`. This could switch parents order in some situation (eg: some of the evolve evolving merge case). Recording and using the information fixes the issue in evolve. We are not aware of core commands calling graft in that fashion, so we could not build a simple test case for it using core commands.

== New Features ==


== New Experimental Features ==


== Bug Fixes  ==


== Backwards Compatibility Changes ==


== Internal API Changes ==