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 16:52:33 +0100 Message-ID: References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422806002 6809 80.91.229.3 (1 Feb 2015 15:53:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 15:53:22 +0000 (UTC) Cc: emacs-devel@gnu.org, Dmitry Gutov To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 16:53: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 1YHwps-0008P1-Al for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 16:53:20 +0100 Original-Received: from localhost ([::1]:50908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwpr-00081G-N5 for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 10:53:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwpf-00080K-JZ for emacs-devel@gnu.org; Sun, 01 Feb 2015 10:53:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHwpe-0004Oo-8l for emacs-devel@gnu.org; Sun, 01 Feb 2015 10:53:07 -0500 Original-Received: from mx1.bahnhof.se ([213.80.101.11]:57747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwpY-0004O2-LT; Sun, 01 Feb 2015 10:53:00 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx1-reinject (Postfix) with ESMTP id A7E6840B90; Sun, 1 Feb 2015 16:52:58 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF1) Original-Received: from mf1.bahnhof.se ([127.0.0.1]) by localhost (mf1.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ftarWfioflyY; Sun, 1 Feb 2015 16:52:53 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf1.bahnhof.se (Postfix) with ESMTP id 1254C330AF9; Sun, 1 Feb 2015 16:52:52 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id DF74652B493; Sun, 1 Feb 2015 15:52:52 +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 QkmzbaW3YEF9; Sun, 1 Feb 2015 16:52:34 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id 4C33152B490; Sun, 1 Feb 2015 16:52:34 +0100 (CET) In-Reply-To: <83siepiqys.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 01 Feb 2015 17:36:27 +0200") 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.11 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:182180 Archived-At: Eli Zaretskii writes: >> Date: Sun, 01 Feb 2015 08:11:24 +0200 >> From: Dmitry Gutov >> >> Given the above, maybe you should revert the merge. Then squash all >> commits in xwidget into one patch, amend it with proper ChangeLog >> entries, and then do the merge. > > Is it just me, or is someone else bothered by the fact that all the > first parents now follow Joakim's commits on his feature branch? > > Joakim, did you per chance push to master from your branch? The thing I thought I did was merging from the feature branch to master, and then push master. How do I dig myself out of this hole now then? -- Joakim Verona