Multiple heads?

[Martin Geisler]

Martin Marques <martin at marquesminen.com.ar> writes:

> Martin Geisler escribió:
>> "Joseph Turian" <turian at gmail.com> writes:
>>
>>> 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?
>>
>> Well, with 'hg merge'... :-)
>>
>> It will merge two heads into one and thus lower the total number of
>> heads by one. So in your case you will probably need to merge three
>> times.
>
> Actually 2 times, else, he'll run out off heads. ;-)

Yeah, that would be bad... :-)

But actually I interpreted the '+3 heads' output from Mercurial to
mean that three additional heads were added. So then there should be
at least four heads requiring at least three merges to return to a
single-headed repository.

-- 
Martin Geisler

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