From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Live System User Newsgroups: gmane.emacs.devel Subject: Emacs VC issue Date: Mon, 17 Dec 2018 03:01:48 -0500 Message-ID: <87ftuwwphv.fsf@aol.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1545033639 21901 195.159.176.226 (17 Dec 2018 08:00:39 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 17 Dec 2018 08:00:39 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 17 09:00:35 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gYnpK-0005ag-Fd for ged-emacs-devel@m.gmane.org; Mon, 17 Dec 2018 09:00:34 +0100 Original-Received: from localhost ([::1]:45296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYnrR-0005qQ-6x for ged-emacs-devel@m.gmane.org; Mon, 17 Dec 2018 03:02:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYnrF-0005pV-1T for emacs-devel@gnu.org; Mon, 17 Dec 2018 03:02:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYnrA-0008KM-Oz for emacs-devel@gnu.org; Mon, 17 Dec 2018 03:02:32 -0500 Original-Received: from sonic317-29.consmr.mail.bf2.yahoo.com ([74.6.129.84]:38934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gYnrA-0008BF-Bj for emacs-devel@gnu.org; Mon, 17 Dec 2018 03:02:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1545033740; bh=ATwC64QKAF/M2eOlPFquAq+ggiP1bSt6BEws5Izd9eY=; h=From:To:Subject:Date:From:Subject; b=WCrcoBE+UrrCM2+BaI/Sq0PP9lb2mP/2DLq8t29nzZ8yiqA1oapZnLvY6sI0cMwzMWlKqP+4i7VMZNDuWIK/Y4IFi/bZ+wC7EdSIIor/3kfYMt8u0BoWQCe38S2xWnkJBhVEUfsNPwFjIgLeV+RlscRH5Qm83fBYRsCUklbsTCNYDS7n4P6vlUVI90GrWEuyFxjb1kooE+igjZnlG5UAjVMiWh0aWoDhaEKCfEb6PvF2CbGbFXZSeaf2O7XyoINH8nn4tE2lyZHpRAR31QeNTaGkJq2tGct7k1Opw7i+qyXoY8gzYOcFD7/04FtMtlx3R1S1/z5Vh9zjFdTd98F/RQ== X-YMail-OSG: 1ZU4R8oVM1mAleMebCQA6UgdsNmhagNl5Bq4e5dLxJNaPbC8iQ5lpSJ9cr3XCTN UJkUQM2S9QcE2Dj_clmXJuHb_5FH.Tc4Ww8Ihd6tQIfJrQCSOPPVyq8HfqO1M2DbXe0BQD.Hpk6u FbxQw.dyT4PcK_.rmDt486wz1R4WGGKjyscofhKk6ZlfIFph4j6WDNhOLcNAbDEh1uuxTIPuSJeC _h6o8VZl6tYrCyA8FfVm4eZ8ry2nn4yvjeH5iVQsl5yu1ix7KRGpsuo8sEjf5bpfhlsFwefXffRA c0HDFCoUgWndwdeSRl9LSgFeE1YJcGa8g5DNDGD0C3SM6ie9gsS8VLDJxG3KNH7FCOq7OxsHZdoE CCqGR6623bKvStXno8Yqaa2NmYKv5GZV9McJWpxEqZNdMw_bLvHvWw5hS0aPvg10haG2M1jNwXRy X2z9_7c.luUm_nEiJX5bi2xWsQcEy4iKVjKoRwB08twClYYOLpjZyw56aTo4QiKcT60T3kH6zVye X76E.CAbFZh0JZs6sSV4EsTuuee3exHW8V0cJ9JxsFHeaL9pe.hY9BvjOojORzk7gy40yr_xcwcP gEpC2ehdrFN4y2gSRHWoMwUSSmDF4i_C9sVGwYSfTEFQn2.I96URzijgPjhAssrbLRpuT8g7DCHn M3V2vsWeXEDRtl9X6xNH8k73wTqy2PVVKXApmXQl1GzdF6NfLXWrJeMpYWUSBIx6aeagWAwQG9QZ lWWWg_u_IX98yPrbdS.DfNYIxoAKOHjSVrLh9h7uhNp_RJcvZ3tZ0l23IzOEUGirLs9eVMxtb51q Znp.TvMmEbDjIyVvMXoWPhzR8sVX_2U5DOsPOBCI1S Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.bf2.yahoo.com with HTTP; Mon, 17 Dec 2018 08:02:20 +0000 Original-Received: from c-73-16-70-190.hsd1.ma.comcast.net (EHLO localhost.localdomain) ([73.16.70.190]) by smtp425.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID ddfb71ebd633128997e92f121fbee118 for ; Mon, 17 Dec 2018 08:02:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.6.129.84 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:231869 Archived-At: Hi, I am currently experiencing an issue with the Emacs master repo and "vc-update". When I go to "pull", I get the following error: Running "git pull --stat"... >From git://git.sv.gnu.org/emacs 3edddba..61dbe6b master -> origin/master error: Your local changes to the following files would be overwritten by merge: src/macuvs.h Please, commit your changes or stash them before you can merge. Aborting Updating 8c28ac8..61dbe6b Since I did not make any "local changes" (I only do pull and "make"), I suspect that something happened on the remote's end. Eventuslly that would get fixed on the remote end especially as other people encounter the same issue and some maintainer rectified the problem. Then a subsequent "vc-update" would be successful and I would be unstuck. However, since the problem still persists, perfaps others resolved it "locally" somehow? I don't have a modified src/macuvs.h file to stash and I'm not doing a "merge". Using the Emacs VC facilities, how can I fix/solve this so that I can vc-update successfully again? Thanks.