Author: eelco Date: Thu May 10 14:56:19 2012 New Revision: 34046 URL: https://nixos.org/websvn/nix/?rev=34046&sc=1
Log: * Hack svn:mergeinfo to hopefully allow "svn merge --reintegrate" to succeed. The error is: $ svn merge --reintegrate ^/nixpkgs/branches/stdenv-updates svn: E195016: Reintegrate can only be used if revisions 33530 through 34045 were previously merged from https://nixos.org/repos/nix/nixpkgs/trunk to the reintegrate source, but this is not the case: nixpkgs/branches/stdenv-updates/pkgs/misc/screensavers/xscreensaver/default.nix Missing ranges: /nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix:33655-33656 Modified: nixpkgs/branches/stdenv-updates/ (props changed) nixpkgs/branches/stdenv-updates/pkgs/misc/screensavers/xscreensaver/default.nix (props changed) _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
