When pulling, merge and commit after update merges with the wrong branch
Created originally on Bitbucket by MatteoS (Matteo Steccolini)
I have MercurialEclipse 2.1 on Eclipse Kepler SR1, and Mercurial 2.9, on Windows 7 64 bit.
In the pull dialog, I select "Update after pull" and "Merge and, if there are no conflicts, commit after update" (plus "Edit commit message before committing merge").
I'm currently on branch BRANCH1, while on the remote repository the last revision pushed is from BRANCH2; in the last revision of BRANCH2 a file has been deleted. There are no new revisions from BRANCH1 in the remote repository.
Expected behavior when pulling: nothing happens.
What happens instead: there is an attempt to merge BRANCH1 with BRANCH2 (an alert notifies me that a file has been deleted on the remote repository).
This can be a quite disruptive bug, because there could be undetected merges between branches.