Mercury issue in Mercurial

Question

I have a merge problem, which I think are two different heads in HG. When I upgrade between two versions (512 and 502 in the screenshot), there are differences between the files. However, when I try to combine 512 by 502, he says that there is nothing to merge with him. If I update rev. 512 and try to combine 502 to 512, I get the following error message: "Merging with a working ancestor has no effect." Judging by the error message, it looks like 502 is the parent of 512, but based on the graph, they look like two different heads. What am I doing wrong or misunderstanding?

Answer 1

but based on the graph, they look like two different heads. What am I doing wrong or misunderstanding

The graph shows quite clearly that 502 is not a head at all, right there in red. Your view filters out a set of changes, a set of changes that should show that 502 is an ancestor of 512.

Can you turn off the filter and reposition the image, or better yet provide hg glog command line hg glog ?

In the worst case scenario, you can hg update 502 make a do-nothing change whose parent is 502 and then combine it with 512, but you better get a complete picture / understanding of what is happening.