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 A8FC3139694 for ; Sat, 15 Jul 2017 10:23:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A9A3E0EB1; Sat, 15 Jul 2017 10:23:20 +0000 (UTC) Received: from mail-io0-x22d.google.com (mail-io0-x22d.google.com [IPv6:2607:f8b0:4001:c06::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18F9FE0E9E for ; Sat, 15 Jul 2017 10:23:20 +0000 (UTC) Received: by mail-io0-x22d.google.com with SMTP id z62so25313005ioi.3 for ; Sat, 15 Jul 2017 03:23:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=DBSYAu2Fh5NW4GHCUSQ2v+dpRZLGa+nBZm0jR98xbGE=; b=vhX1SOggsGXnDrF4gB8FZV8G2/d7k+NGdEuBuUZIA2JQxZ1kvhb8p0pvE3yPIT2U0s rVtC8w17lT8+TZ/LKARIccT3Kfs5RccjVCwkwdi48rEpBRoIpNFZNHHZkCiHsmpMxZx4 GwOh7ZQdgIWrU2AWOuxKRBENxRLqa6/Fq4adJ9UNkHpfX6WcfMl+DKpPvyNoN3hZ2ihy yNt3NLopVVFeECzb7vCJk575kjX89Xo+NA1YemTolnpOiyCpxvdMTo5iajs+SdwMy5VX Rn83uwCv9uL11ZLdNhNdS3YlQIqDsHEnmLrbIDTegAvlXk++ZZ4owB/ChGqcJW004ohY s9mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=DBSYAu2Fh5NW4GHCUSQ2v+dpRZLGa+nBZm0jR98xbGE=; b=i1cc4ygaFFe4Ia+sTWz1q/8pxNsZM9C5jQBLgsC8U1aryE5k6o/joYRgbEcW+V2DG2 xI7xp9OHme44MgKneJZUjchArqMk9cCLio8U4LcMSJl+zqrQEj4zc0JF+PHKgx+9fJMQ X3HhYH/Uip7jfLtx193sWkkuOzbUueMtPT8UMJFPrCqihzhE5EIjIg2TyCSBUH48SZLv tZYfdya6lZiPrfKnH2StKnunPTjVGBIQj3mpMjaeqfn0dLHHCB7+NK92bClAox7MigY2 IidcrWNLgUrzU6O4NfTTxpLdlQnxSsGUHBnjCHtZw9897LANqW6jozs6IxPVNM0JEXOB 6E5Q== X-Gm-Message-State: AIVw112JXNPeUn84u6QwqUcv9UsmRqwf80U5F2+nmXtWi5rjqzBpMfO4 8h5vz80BlCp0buQcODI2yScnRSGC7J+6Vt4= X-Received: by 10.107.23.4 with SMTP id 4mr14529928iox.110.1500114199180; Sat, 15 Jul 2017 03:23:19 -0700 (PDT) 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 Received: by 10.36.31.149 with HTTP; Sat, 15 Jul 2017 03:22:38 -0700 (PDT) In-Reply-To: <2177616.rJ7vxfjn4A@peak> References: <2177616.rJ7vxfjn4A@peak> From: Alexander Kapshuk Date: Sat, 15 Jul 2017 13:22:38 +0300 Message-ID: Subject: Re: [gentoo-user] Can't emerge --sync To: Gentoo mailing list Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: e4ffef88-bbde-491e-9efc-a9b495ae7ecc X-Archives-Hash: 629c0b37516a9a4826c108ce69359efa On Sat, Jul 15, 2017 at 1:00 PM, Peter Humphrey wrote: > 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 > > git-checkout(1) has a '--theirs' option that might do the trick there: The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. ... You could try: git checkout --theirs metadata/layout.conf