From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 18:56:45 +0300 Message-ID: <55673ABD.6000100@yandex.ru> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <83bnh4ydci.fsf@gnu.org> <87a8wo3fyk.fsf@gmx.de> <83382gybkc.fsf@gnu.org> <87vbfc1yz0.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1432828646 25808 80.91.229.3 (28 May 2015 15:57:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 15:57:26 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Michael Albinus , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 17:57:19 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yy0BJ-00051Q-QR for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 17:57:18 +0200 Original-Received: from localhost ([::1]:59691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy0BJ-0001kE-5w for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 11:57:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy0BF-0001i9-8j for emacs-devel@gnu.org; Thu, 28 May 2015 11:57:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yy0BC-00054t-3b for emacs-devel@gnu.org; Thu, 28 May 2015 11:57:13 -0400 Original-Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:36052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy0BB-0004sX-Tm; Thu, 28 May 2015 11:57:10 -0400 Original-Received: by wizk4 with SMTP id k4so152124420wiz.1; Thu, 28 May 2015 08:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=smhdzdGU1YDUm1KmWJoAKu1keP9KyDLkKs0hZpqxXho=; b=ifZn2DPDupq2O9l3GUa1r7T3up1uEe9Jk/2Hq0RaGi9sDv1UT0xUeoc6j6NotMUWk5 1VtFvU6ok5IUKp+V/c7mVX6wR5Z9wJ0uZ8Lx5Qr+zbQSWHLQISZxggJdj1j1lzwWimi3 vaFWJOQct8z4UCS4yDdz0s1D2YiG0y3Ol96X4hNguPwcxV+m0A0gF/vs+4yVOsVPO3K7 Gn/1RVFkelr1I2GF+ZJSLlWiKt04Q5z/Qry08Zb/2Vz7xiJsJAdwDgYj+/nD4Z97HId7 lfk/7YtW6SefltBzllVUOFk9v5OlfxIhK9cfxbUcJC3Dd/KYHtJHx1fpeKjh12Q/Ng8h UlEQ== X-Received: by 10.180.76.228 with SMTP id n4mr17160069wiw.44.1432828607299; Thu, 28 May 2015 08:56:47 -0700 (PDT) Original-Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id fa8sm4602135wib.14.2015.05.28.08.56.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 08:56:47 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: <87vbfc1yz0.fsf@gmx.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::229 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:186918 Archived-At: On 05/28/2015 06:52 PM, Michael Albinus wrote: > The other files I've simply reverted in > Emacs' vc-dir buffer, via "C-x v u", IIRC. Yeah, you shouldn't have done that. When you're merging the upstream into the current branch, and there's a conflict, it stages all new changes that apply without conflicts and asks you to resolve the conflicts in the rest of files (and stage them too). Reverting any of the already staged files means you remove those changes from the tree the merge will result in.