[Nix-dev] Re: new possible movement to git (?)

[Michael Raskin]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/04/2010 09:35 PM, Marc Weber wrote:
> Are you talking about merging?
> 
> a - x -y - MERGE - ...
>  `- B -C ` 
> 
> So that its hard to find out whether x - y or B - C was stdenv-updates?
> We could add a BRANCH-INFO file then and put the info in there.

Well, if we want to do that, maybe we have to agree on the set of
necessary kludges beforehand.

> Git *is* stupid by design. You could mark it by tagging as well
> tag-stdenv-updates-before-merge.

Design? Git has no design, just speed optimizations. Look at Darcs for
what a VCS design is.

If we wish to use history as something more than unlabeled graph, we
need to decide now - SVN to Git move can be a lossy operation.

> However git is different anyway. Probably we're not going to have
> stdenv-anymore. We'll have branches such as gtk-updates  xorg-updates,
> ... and maybe a branch called "next" which is a merge of those topics.

You understand that you are just strengthening my point? I understand
that _any_ DVCS (probably even SVK) simplifies having lighter branches.
But Git considers OK to GC branch data. And no, it is not ignoring
historical branch data - as you claimed it does for simplicity - it
stores reflog and can be made to clean it. I am not even sure how much
of history rewriting is actually a good idea (as opposed to
cherry-picking from a local branch/a local-only second head of the branch).

Personally, I am promoting Monotone, as it has deliberately hard-to-lose
history, commit property authentication (i.e. you know who set what
tag), and also will allow us to have things like a branch (maybe
discontinuous) of revisions fully processed by Hydra.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJMWchPAAoJEE6tnN0aWvw3ndQH/iRrNOqpR1uXglgmU3B1OK5P
Frrtgdqd3Ai7wJ7gk+F24FHCsGlQaPFmzJhCrPn7nqzPsXgodAISVEHl5sczVP3o
/DmYAPrHz7yPR6ANafZGk1QaiA+Z4XL5AYhPKcwjjnKNN0kwDqT+m0zReTcXwOA8
ybr865g2dju7YMf/XpJxBQBVBvniASVOIO/twwv9651Mnf/YtpTPmNnNAMSdHcyA
MGs161jPpWbOIa7BFcLhheUue+8xf3S2qeTvAb4MGW1CA5RqBvjcxJdAG9PMzuMQ
zgFOrS4x+LkHaPfhrmSZj2kHpfJGmt2M8iLfRxWvCE+l1voo8hc2LuUGNhSrX+g=
=3Wwv
-----END PGP SIGNATURE-----