[Nix-dev] stdenv-update (was: fixed!)

[Peter Simons]

Hi Eelco,

 > We should merge this with the trunk soon because it's kind of a nasty bug.

I tried to merge stdenv-updates into trunk by means of Git, but that
didn't work too well. Apparently, the earlier merger(s) are invisible in
a repository that's been imported with git-svn; normally merging (or
cherry-picking) works quite well.

Anyway, is there some sort of documented procedure how to perform that
merge properly?

Personally, I'd be happy to see trunk updated.

Take care,
Peter