From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 17:15:36 +0100 Message-ID: <87twz5d2vr.fsf@igel.home> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> <87y4ohd3d3.fsf@igel.home> <87iofl8vdl.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422807358 27440 80.91.229.3 (1 Feb 2015 16:15:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:15:58 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org, joakim@verona.se, Dmitry Gutov To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 17:15:53 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 1YHxBg-00078w-TH for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:15:53 +0100 Original-Received: from localhost ([::1]:50985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxBg-0000yF-7e for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:15:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxBY-0000y8-HC for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:15:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHxBU-0003Rq-24 for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:15:44 -0500 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:44586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHxBT-0003Qb-Gl for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:15:39 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3kZy7Z0tB4z3hjj3; Sun, 1 Feb 2015 17:15:38 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3kZy7Y6WZwzvh23; Sun, 1 Feb 2015 17:15:37 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id vEmC3Py5ZQQ6; Sun, 1 Feb 2015 17:15:37 +0100 (CET) X-Auth-Info: WFKiolc9DRlLea/311lUpAzxzCzpOnifvJa8Uv0CxxwJfwMQ6Vvl7eOWoMNHp29F Original-Received: from igel.home (ppp-212-114-182-189.dynamic.mnet-online.de [212.114.182.189]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 1 Feb 2015 17:15:37 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id C72C72C341F; Sun, 1 Feb 2015 17:15:36 +0100 (CET) X-Yow: YOW!! What should the entire human race DO?? Consume a fifth of CHIVAS REGAL, ski NUDE down MT. EVEREST, and have a wild SEX WEEKEND! In-Reply-To: <87iofl8vdl.fsf@engster.org> (David Engster's message of "Sun, 01 Feb 2015 17:11:18 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:a60:0:28:0:1:25:1 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:182189 Archived-At: 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. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."