I play with Mercurial to find out if it is suitable for use in our company. One of the big outlets is the possibility of a merger. So I played with creating branches and merging them into a default line. Testing involved simply adding a new method (methodA) to one Java file in one branch and adding another method (methodB) to a completely different place in the same file in another branch.
When I first tried it in Eclipse using the team-> merge option, I found that the first merge worked fine (i.e., added method A). When I try to merge the second branch, now it tells me that there is a conflict that I have to resolve. This is very unfortunate because I thought that this simple kind of merge was exactly what Mercurial had to deal with easily?
I tried the exact same test using the command line, and this time it worked fine, i.e. both mergers were successful, without the need for conflict resolution. Looking at the console output in eclipse, the following command is used to perform the merge:
hg -y merge
then when I run it myself from the command line, I just do:
hg merge -r 1234
"internal: fail", , Eclipse? , , ?