From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B1B6C139694 for ; Sat, 15 Jul 2017 10:00:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DD38E0EA8; Sat, 15 Jul 2017 10:00:03 +0000 (UTC) Received: from smarthost01c.mail.zen.net.uk (smarthost01c.mail.zen.net.uk [212.23.1.5]) by pigeon.gentoo.org (Postfix) with ESMTP id 118CFE0E97 for ; Sat, 15 Jul 2017 10:00:02 +0000 (UTC) Received: from [82.69.80.10] (helo=peak.localnet) by smarthost01c.mail.zen.net.uk with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1dWJrl-00013J-M9 for gentoo-user@lists.gentoo.org; Sat, 15 Jul 2017 10:00:01 +0000 From: Peter Humphrey To: gentoo-user@lists.gentoo.org Subject: [gentoo-user] Can't emerge --sync Date: Sat, 15 Jul 2017 11:00:01 +0100 Message-ID: <2177616.rJ7vxfjn4A@peak> User-Agent: KMail/4.14.10 (Linux/4.9.34-gentoo; KDE/4.14.32; x86_64; ; ) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Originating-smarthost01c-IP: [82.69.80.10] Feedback-ID: 82.69.80.10 X-Archives-Salt: 2dd91bfd-2969-4ebd-b187-c6b748099b3d X-Archives-Hash: d4158fa9a575b964b0c3515f23dcba95 Hello list, Today I get this: # emerge --sync >>> Syncing repository 'gentoo' into '/usr/portage'... /usr/bin/git pull remote: Counting objects: 25, done. remote: Compressing objects: 100% (9/9), done. remote: Total 25 (delta 15), reused 25 (delta 15), pack-reused 0 Unpacking objects: 100% (25/25), done. >From https://github.com/gentoo-mirror/gentoo c80ef88a736..b9cb9e0b42e stable -> origin/stable Updating c5ec29f674c..b9cb9e0b42e error: Your local changes to the following files would be overwritten by merge: metadata/layout.conf Please commit your changes or stash them before you merge. Aborting !!! git pull error in /usr/portage I can't imagine I'd ever make any changes to that file, especially not using git, but I tried reverting to backups of /var and /usr/portage from a week ago, but I still get the same error. Using backups from two weeks ago also made no difference. I sync and update every day, with never a problem like this before. Can anyone see what else I should try? Should I just delete the offending file? (I'll get some coffee meanwhile...) -- Regards Peter