From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 16:51:26 +0100 Message-ID: <87r3u98wap.fsf@engster.org> 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 1422805938 5842 80.91.229.3 (1 Feb 2015 15:52:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 15:52:18 +0000 (UTC) Cc: emacs-devel@gnu.org, joakim@verona.se, Dmitry Gutov To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 16:52:17 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 1YHwol-0007g1-Nx for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 16:52:11 +0100 Original-Received: from localhost ([::1]:50902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwol-00077D-78 for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 10:52:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwoM-0006eP-B8 for emacs-devel@gnu.org; Sun, 01 Feb 2015 10:51:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHwoI-0003kf-7r for emacs-devel@gnu.org; Sun, 01 Feb 2015 10:51:46 -0500 Original-Received: from randomsample.de ([5.45.97.173]:33445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHwoH-0003jH-Vw; Sun, 01 Feb 2015 10:51:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=3mWyL+kw9uf0ys4yVViOfq+osG5aX9v8jnUj68FLngw=; b=fFyC88nOoymHdWQmicGvOiSSGTOUKkP2SP5xVOaaYwoUqBmji6X8zFBry4m7+sJ0aHIIbvWwyDTIjtr9M4yb/I9Ttogn811ZON8dvhEsuyQdfXFx7Zo+EAPaQUgwxUqm; Original-Received: from ip4d149227.dynamic.kabel-deutschland.de ([77.20.146.39] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YHwoA-0001o2-E5; Sun, 01 Feb 2015 16:51:34 +0100 In-Reply-To: <83siepiqys.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 01 Feb 2015 17:36:27 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:182178 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? It's a bit weird, yes. Especially when you do 'gitk --all', all those 'merge from trunk' commits are now somehow registered as a separate branch, leading to a completely crazy layout of the DAG which doesn't even fit on my screen anymore. I've never seen anything like it. Can someone explain what happened here? -David