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] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Mon, 02 Feb 2015 18:19:08 -0500 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> <87egq98m7w.fsf@engster.org> <54CE80E5.2090205@yandex.ru> <83zj8xh0dr.fsf@gnu.org> <54CE8F97.80209@yandex.ru> <83wq41gfc9.fsf@gnu.org> <87y4og7n9t.fsf@engster.org> <83iofkgtsk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422919164 19081 80.91.229.3 (2 Feb 2015 23:19:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 23:19:24 +0000 (UTC) Cc: dgutov@yandex.ru, schwab@linux-m68k.org, joakim@verona.se, David Engster , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 03 00:19:23 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 1YIQH4-0006sv-M4 for ged-emacs-devel@m.gmane.org; Tue, 03 Feb 2015 00:19:22 +0100 Original-Received: from localhost ([::1]:57082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIQH3-0004XW-O1 for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 18:19:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIQGy-0004WJ-4m for emacs-devel@gnu.org; Mon, 02 Feb 2015 18:19:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIQGx-0000oW-8J for emacs-devel@gnu.org; Mon, 02 Feb 2015 18:19:16 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:5617) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIQGr-0000nf-85; Mon, 02 Feb 2015 18:19:09 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AskIAOwQflRFxIJW/2dsb2JhbABbgweDYMp3BAICgSQXAQEBAQEBfIQDAQEDAVYjBQsLNBIUGA0kiEoJ1lkBAQEBBgEBAQEekG8HhEgFhDqGR4xUgXKVaIF4hBkhgncBAQE X-IPAS-Result: AskIAOwQflRFxIJW/2dsb2JhbABbgweDYMp3BAICgSQXAQEBAQEBfIQDAQEDAVYjBQsLNBIUGA0kiEoJ1lkBAQEBBgEBAQEekG8HhEgFhDqGR4xUgXKVaIF4hBkhgncBAQE X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="109501341" Original-Received: from 69-196-130-86.dsl.teksavvy.com (HELO ceviche.home) ([69.196.130.86]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Feb 2015 18:19:08 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 6835566100; Mon, 2 Feb 2015 18:19:08 -0500 (EST) In-Reply-To: <83iofkgtsk.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 02 Feb 2015 18:30:35 +0200") 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:182298 Archived-At: > That will only fix the last instance of such merges. But maybe we > don't care. In my experience, Git makes it very easy to get the parents "in the wrong order" (contrary to Bazaar which paid special attention to it). The upside is that Git is not very much affected by the order of parents, in most cases. So it's probably not worth worrying about. Stefan