From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Wed, 27 May 2015 22:40:41 -0400 Message-ID: References: <20150527165006.32357.80915@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432780863 31400 80.91.229.3 (28 May 2015 02:41:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 02:41:03 +0000 (UTC) Cc: emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 04:40:55 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 1Yxnkc-0002a3-8a for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 04:40:54 +0200 Original-Received: from localhost ([::1]:56063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxnka-0006sg-Ps for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 22:40:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxnkX-0006sa-Cm for emacs-devel@gnu.org; Wed, 27 May 2015 22:40:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxnkS-00069r-CN for emacs-devel@gnu.org; Wed, 27 May 2015 22:40:49 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:57123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxnkS-00069k-1n for emacs-devel@gnu.org; Wed, 27 May 2015 22:40:44 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CYDQA731xV/9N+3mhcgxCBMoJQwRWHSwQCAoE8OxIBAQEBAQEBgQpBBYNdAQEDAVYjBQsLNBIUGA0kE4gXAwoIzyMBAQEHAgEfizqCTYI4B4QtAQS1BCOCChwVgVkiMYJHAQEB X-IPAS-Result: A0CYDQA731xV/9N+3mhcgxCBMoJQwRWHSwQCAoE8OxIBAQEBAQEBgQpBBYNdAQEDAVYjBQsLNBIUGA0kE4gXAwoIzyMBAQEHAgEfizqCTYI4B4QtAQS1BCOCChwVgVkiMYJHAQEB X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="122525357" Original-Received: from 104-222-126-211.cpe.teksavvy.com (HELO fmsmemgm.homelinux.net) ([104.222.126.211]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 May 2015 22:40:42 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id DA87CAE0C8; Wed, 27 May 2015 22:40:41 -0400 (EDT) In-Reply-To: (Michael Albinus's message of "Wed, 27 May 2015 16:50:13 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:186891 Archived-At: > branch: master > commit f9fabb2bb099d944cc97a87933b86b9eae02d067 > Merge: 570edf2 b0f3a49 > Author: Michael Albinus > Commit: Michael Albinus > Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs What happened, here? git diff 570edf2..f9fabb2bb099d944cc97a87933b86b9eae02d067 is empty (i.e. the "merge" just threw away all the changes from b0f3a49, i.e. from "master"). And indeed: git diff b0f3a49..f9fabb2bb099d944cc97a87933b86b9eae02d067 shows that you reverted a bunch of the recent commits applied to "master". How did this happen? Stefan