Skip to content
  • Sushil Khanchi's avatar
    evolve: remove swapping nodes logic while resolving divergence · d7d954b6d518
    Sushil Khanchi authored
    Before this patch, while solving content-divergence if one of the
    divergent cset need to relocate to resolution parent we used to set that
    cset to "other" side; so it was like we are always going to relocate "other"
    side which made us to swap the two if "divergent" cset need to relocate.
    
    Above mentioned solution for relocating cset was not good and led us to incorrect
    output in some cases.
    
    So this patch, simplify the logic and remove the swapping thing and clearly depend
    on resolution parent to check if any of the divergent cset needs to relocate.
    This also means that now in some cases if both the divergent csets needs
    to relocate, both will be relocated. Even before this patch, there are some cases
    where both the divergent csets relocated but not in every case where it should
    have.
    
    Coming to the changes in test files:
    1) changes in order of merging the two divergent csets is due to fact that
       now "divergent" and "other" are not swapped and hence "divergent" will be at
       local side and "other" will be at "other", which also results in change in
       the hash id for some cases.
    
    2) extra changesets: which is the result of the fact that now we don't miss
       any case where both the divergent csets should be based on resolution parent
       before performing the merge -> which caught some cases and performed relocation,
       hence extra changesets. Although you can find that there is no changes in file
       content because of these relocation, but I remember loosing some data because
       of not relocating the "divergent", so why leave any risk out there by not
       relocating "other" to the resolution parent.
    d7d954b6d518