Promoting the use of Mercurial; was: Re: gnome dvcs survey results

[Arne Babenhauserheide]

Am Freitag 09 Januar 2009 15:36:26 schrieb Theodore Tso:
> On the git side, uses of git octopus merges would not be
> allowed.

Couldn't these be simply emulated by multiple merges on the Mercurial side, 
maybe all merges done in a bookmark or something similar which clearly marks 
them as representation of an octopus merge? 

Or just save a list of octopus merges from git and store that in the .hg as 
hgsubversion does it, so that the octopus merge can be recognized. 

Pushing octopus merges seems low priority for me, though, since they muddle up 
history - I'd rather prefer hg to push back changes clean as they are. 

> There are more complicated ways we could do things; for example, the
> information from the foreign system could be stashed in a hg-specific
> or git-specific location.  For example, hg could grow the ability to
> optionally store the committer ID, or maybe the git developers could
> add new (optional) fields to git's commit object.

You could check how the hgsubversion project deals with storing svn revisions 
for each Mercurial changeset in the converted repository. 

The same way could be used to save committed-by IDs and any other incompatible 
data from git. 

We'd simply have a bridge repo, then, to which we could just push our changes 
and then push them to git from that bridge repo (just like using an outgoing 
repo). 

Naturally we could also directly work in the bridge repo. 

As soon as hg has that, git might experience pressure to add the same gateway 
into the other direction. 

Best wishes, 
Arne
-- 
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the 
history of free software.
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)

-- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : http://selenic.com/pipermail/mercurial/attachments/20090109/0854a06b/attachment.pgp