comparison .hgignore @ 4991:2928f35023a1 stable

evolve: make sure divergence resolution doesn't undo changes (issue6203) Before this patch, in content-divergence resolution logic if resolution parent is not the parent of any of the two divergent changesets then it could undo some changes introduced by previous revs (while resolving stack of content-divergent changesets) as demonstrated by the test added in previous patch. To solve this, what this patch doing is: if divergent cset has obsolete parent with a successor then first resolve the "orphan" instability of divergent cset by relocating, then perform the content-divergence resolution. After this change in logic, I found that it's kind of more correct as reflected by the changes in tests/test-evolve-content-divergent-corner-cases.t where it prevented creating conflicts while merging. Changes in tests/test-evolve-content-divergent-stack.t demonstrate the fixed behaviour. Next patches will be covering the `evolve --continue` case for the relocation of "divergent" cset.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 23 Nov 2019 16:17:04 +0530
parents aad37ffd7d58
children ba316ce15040
comparison
equal deleted inserted replaced
4990:f3fd3c1c3da0 4991:2928f35023a1