Multiple heads?

[Martin Geisler]

"Joseph Turian" <turian at gmail.com> writes:

(I have de-top-posted your reply, please see below.)

> On Fri, Jun 6, 2008 at 1:13 PM, Joseph Turian <turian at gmail.com> wrote:
>> 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?
>
> Ah, the revision is the prefix of the changeset.
> Thanks again!

No problem -- you can use either: the number 91 is a per-clone
revision number and 8ca9bc9affd6 is the changeset identifier (part of
the cryptographic hash value that identifies the changeset).

The short revision number is just a simple counter that numbers the
changesets in a particular clone. Another clone might use the number
91 for a different changeset than 8ca9bc9affd6 (if they made a
different commit after their revision 90) so you should only use the
revision number for manipulating that particular clone -- always use
the hash values when talking to others about a changeset.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multi-Party Computation) to Python. See: http://viff.dk/.