From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 17:18:35 +0100 Message-ID: References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> <87y4ohd3d3.fsf@igel.home> <87iofl8vdl.fsf@engster.org> <87twz5d2vr.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422807564 30346 80.91.229.3 (1 Feb 2015 16:19:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:19:24 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org, David Engster , Dmitry Gutov To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 17:19:20 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 1YHxF1-00013S-Gd for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:19:19 +0100 Original-Received: from localhost ([::1]:50994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxF0-0001yc-TG for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:19:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxEw-0001yW-8z for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:19:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHxEr-0004RS-Jf for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:19:14 -0500 Original-Received: from mx6.bahnhof.se ([213.80.101.16]:52424) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxEm-0004Qn-7g; Sun, 01 Feb 2015 11:19:04 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx6-reinject (Postfix) with ESMTP id 805354134A; Sun, 1 Feb 2015 17:19:03 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF4) Original-Received: from mf4.bahnhof.se ([127.0.0.1]) by localhost (mf4.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XcchFYsXfJIo; Sun, 1 Feb 2015 17:18:58 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf4.bahnhof.se (Postfix) with ESMTP id 727313D7876; Sun, 1 Feb 2015 17:18:55 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id 1F89052AEF4; Sun, 1 Feb 2015 16:18:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at verona.se Original-Received: from mta.verona.se ([127.0.0.1]) by localhost (exodia.verona.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1Ujmr6elCuLj; Sun, 1 Feb 2015 17:18:35 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id BCA8152B485; Sun, 1 Feb 2015 17:18:35 +0100 (CET) In-Reply-To: <87twz5d2vr.fsf@igel.home> (Andreas Schwab's message of "Sun, 01 Feb 2015 17:15:36 +0100") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 213.80.101.16 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:182191 Archived-At: Andreas Schwab writes: > David Engster writes: > >> Andreas Schwab writes: >>> joakim@verona.se writes: >>> >>>> The thing I thought I did was merging from the feature branch to master, >>>> and then push master. >>> >>> No, you did exactly the other way round: >>> >>> commit 69815df >>> Merge: 4edad42 a2c32b0 >>> Author: Joakim Verona >>> Date: Sun Feb 1 00:37:46 2015 +0100 >>> >>> Merge branch 'master' into xwidget >> >> Yes, but I'm willing to bet he actually *did* switch to 'master' >> afterwards and did >> >> git merge xwidget >> >> which was then however resolved as 'fast-forward', so you don't see it. > > But only because he merged from master, which was wrong to begin with. Yes this was probably what I did. > Andreas. -- Joakim Verona