[Nix-dev] Error updating stdenv-updates from trunk

[Lluís Batlle]

I tried from two Working Copies in two computers, and what I get is:
svn: Commit failed (details follow):
svn: File 'pkgs/development/libraries/glib/default.nix' is out of date
svn: '/repos/nix/!svn/wrk/2af334c6-c3f2-11de-99d6-dfcb75341a5c/nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glib/default.nix'
path not found

'svn update' or 'svn cleanup' do not help.

Here is how I attempt the update. In a stdenv-updates working copy:
svn merge -r 17115:18006 https://svn.nixos.org/repos/nix/nixpkgs/trunk
# From the last merge
Fix the conflicts:
- perl-5.10: keep the 'working' part only.
- all-packages: accept 'udev' as makeOverridable
- ocaml: remove the default.nix file

That's all. May someone attempt the same? Shouldn't work what I do?

Regards,
Lluís.