persistent modification

[Jonathan Lundell]

I modified a local file in a read-only local repository. The owner implemented my updates, and I pulled the mods. Now I see this:

[Jens Alfke]

On Jul 6, 2010, at 2:52 PM, Jonathan Lundell wrote:

> Near as I can tell, there are no diffs (and hg diff/hg status agree). And what's the green icon?

That icon indicates a resolved merge conflict. Probably it’s in that state because it’s a ‘conflict that isn’t a conflict’, i.e. both you and upstream modified the same line, but in the same way.

Try ‘hg resolve -l” [that’s a lowercase L] to see what files Mercurial thinks need resolving. It probably lists that file, because that’s the command Murky uses to figure out that state.

—Jens

[Jonathan Lundell]

Indeed yes; thanks. hg update fixed the problem.

[Jonathan Lundell]

A question, though: presumably the Murky Update button would have had the same effect, yes? Why didn't the update checkbox in the pull dialog also do it?