how can you tell you have merged?

[Adrian Buehlmann]

On 11.09.2008 19:14, Matt Mackall wrote:
> On Thu, 2008-09-11 at 02:15 -0400, Douglas Philips wrote:
>> On or about 2008 Sep 11, at 2:13 AM, Patrick Waugh indited:
>>> hg clone hello my-new-hello
>>> cd my-new-hello
>>> sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c
>>> hg commit -m 'A new hello for a new day.'
>>> hg pull ../my-hello
>>> hg merge
>>>
>>> Now, how can you tell that you have done a merge?
>>>
>>> So, since I'm still seeing two heads, how would I know (if I left,
>>> came back and had forgot I had done a merg) that the merge was
>>> complete but that I still needed a commit?
>> hg parents
> 
> There is apparently a large flaw in our documentation such that many
> users are unaware of this essential basic command. It should be one of
> the first concepts they learn. How do we fix it?

I've added some 'hg parents' call examples to QuickStart, TutorialClone and
TutorialFirstChange on the wiki.

There was not a single hg parents example, which is indeed amazing, given
how important this command is.

Hopefully this will increase awareness for that command.