[issue400] Outstanding changes & Merge errors

[Scott Paeth]

New submission from Scott Paeth <scott_karana at hotmail.com>:

I use HG version 0.9, for starters. If I have outstanding changes in a branch 
(unbeknownst to me) and pull changes from a remote SSH server in such a way that 
creates two heads, I see nothing out of the ordinary until I try to "hg merge" 
where I get a complaint about uncommitted changes; if I commit the changes, and 
then try to merge, I get a "no merge needed: try hg update", and "hg update" 
reports that there is no work to do. If I check the files I know were should 
have been editted in the merge, they've not been changed.
I'm not sure if this is specific to SSH, or the fact that my local HG client is 
on a Mac, or that the remote version is on FreeBSD; both machines are running 
Python 2.4.3.

----------
messages: 2256
nosy: scott_karana
priority: bug
status: unread
title: Outstanding changes & Merge errors
topic: patch, surprise

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue400>
____________________________________________________