Octopus merge again

[Thomas Arendsen Hein]

* Radoslaw Szkodzinski <astralstorm at gorzow.mm.pl> [20050619 09:48]:
> you can safely import octopus merges as a single changeset.

I think you need one changeset for each parent, but this would be
safe, too. But still this has to be implemented in the converter.

> Q: Does Mercurial support multiple parents in a sane way?

Every node has exactly two parents, but any of them can be the
nullid, i.e. the big bang.

> (similar to multiple heads)

There is no list of heads. Heads are just nodes which have no
children.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20050619/0f2c0005/attachment-0001.asc>