comparison tests/test-check-module-imports.t @ 42915:a4ca0610c754 stable

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.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 09 Sep 2019 17:32:21 +0200
parents b05a3e28cf24
children 7054fd370430
comparison
equal deleted inserted replaced
42848:344a086bb764 42915:a4ca0610c754