Two heads?

[Adrian Buehlmann]

On 12.07.2009 21:54, Giorgos Keramidas wrote:
> On Sun, 12 Jul 2009 13:29:41 -0400, Joseph Turian <turian at gmail.com> wrote:
>> Somehow I ended up with a repository with two heads:
>>
>> @  changeset:   40:eeb915309a23
>> |  tag:         tip
>> |  parent:      36:b2e90abb1c66
>> |
>> | o  changeset:   39:c6eced54cb31
>> | |  user:        Joseph Turian <turian at iro.umontreal.ca>
>>
>> How do I merge them?
>>
>> If I try:
>> $ hg merge
>> abort: outstanding uncommitted changes
>>
>> If I try:
>> $ hg commit
>> nothing changed
> 
> On Sun, 12 Jul 2009 21:12:12 +0200, Mads Kiilerich <mads at kiilerich.com> wrote:
>> What is the output of
>> hg --version
>> hg status
> 
> Please also include the output of "hg parents".

Essential info indeed.

In this case though -- unless the glog picture is incomplete -- the info should
already be there: There is a single parent eeb915309a23 (tip).