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

Marc Weber marco-oweber at gmx.de
Wed Aug 4 19:35:26 CEST 2010


Excerpts from Michael Raskin's message of Wed Aug 04 19:21:57 +0200 2010:
> > http://thread.gmane.org/gmane.linux.distributions.nixos/4425/focus=4440
> I said about having a Git mirror being a good start in multi-VCS system.
> Storing repository in Git has some drawbacks, as it stores too little
> history. As far as I know with our branch/merge cycle for
> stdenv-updates, it would be impossible to find out which path was
> stdenv-updates and which was trunk except by counting distinct stdenvs
> on each path.

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.
Git *is* stupid by design. You could mark it by tagging as well
tag-stdenv-updates-before-merge.

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.
 
> Is there anyone using Tailor for Git->SVN? It may turn out to be easier...
Lets wait and see whether anyone wants such a SVN solution at all.

I'm happy to discuss alternatives. So if you prefer a different vcs its
the time to tell us about it.

Marc Weber



More information about the nix-dev mailing list