diff mercurial/simplemerge.py @ 20591:02c60e380fd0 stable

merge: record the "other" node in merge state We need to record the merge we were merging with. This solve multiple bug with resolve when dropping the second parent after a merge. This happen a lot when doing special merge (overriding the ancestor). Backout, shelve, rebase, etc. can takes advantage of it. This changeset just add the information in the merge state. We'll use it in the resolve process in a later changeset.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 25 Feb 2014 18:42:11 -0800
parents e34106fa0dc3
children 4aeb7a6029ba
line wrap: on
line diff