Multiple heads?
Joseph Turian
turian at gmail.com
Fri Jun 6 12:13:06 CDT 2008
Thank you Martin and Trygve for the advice.
I ran 'hg heads' to determine the heads.
Here is one:
changeset: 91:8ca9bc9affd6
user: turian at ...
date: Wed Mar 05 15:37:16 2008 -0500
summary: jpt
I then run:
hg merge -r 91:8ca9bc9affd6
However, it gives me error:
abort: unknown revision '91:8ca9bc9affd6'!
Is the changeset not the revision? How do I specify the revision?
Thanks,
Joseph
On Fri, Jun 6, 2008 at 4:19 AM, Trygve Laugstøl <trygvis at inamo.no> wrote:
> Joseph Turian wrote:
>>
>> I clone a repository and it says:
>> added 130 changesets with 408 changes to 86 files (+3 heads)
>>
>> Looking at 'hg glog', it does indeed seem that there are three heads.
>> How can I merge these three heads?
>
> Running just "hg merge" will give you the info you need. Since you have more
> that two heads, you will need tell mercurial which heads you want to merge.
> Running "hg heads" will show all the heads and their revisions.
>
> --
> Trygve
>
--
Academic: http://www-etud.iro.umontreal.ca/~turian/
Business: http://www.metaoptimize.com/
More information about the Mercurial
mailing list