mercurial merge issue - need help!

[alwaysLearning]

Following is sequence of actions I executed

Made Changes in file X.java – through hg repo explorer, I see my changes.

Committed changes in X.java to local repository

I pulled changes from central repo which also included non-conflicting
changes by other developer in X.java – I see chages made in X.java by other
developer.

I merged two versions locally,  

After merge what I am seeing that is changes made by other developer are
lost (only) for this file, and post-merge file is same as what I had
committed to by merge before merge. All other files which were only changed
by others are intact. 

I am not sure why merge overwrote other developer’s changes, this has
happened to all files which both developers have changed.

I am using tortoise hg for all mercurial tasks.

Can anyone help me understand what’s going on?

Also, is there anyway I can search such files which are overwritten as a
result of previous merges and already committed to central repo so that I
can fix them? 

-- 
View this message in context: http://mercurial.808500.n3.nabble.com/mercurial-merge-issue-need-help-tp1297920p1297920.html
Sent from the General mailing list archive at Nabble.com.