Problem with Merge mixing up my data

[peter at peterkellner.net]

I like hg most of the time, but I've run into a situation that I keep messing up my merges and would love to know the way to merge without that happening.  Specifically, what I keep doing I finding my commit off on it's own branch as shown in the picture in the jpg below.  Then, I've tried all kind of "wrong" things in the tortiesehg client that ends up giving me "not the latest" changes in the top of the three and my local directory of files is a few iterations old.

Sorry for the confusing question, but if I knew how to do it, I wouldn't be asking.

Thanks

http://peterkellner.net/misc/hg1.jpg


-Peter Kellner
http://peterkellner.net


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20101106/bdb1be28/attachment.htm>