From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Mon, 02 Feb 2015 10:35:14 +0900 Message-ID: <878ughqenh.fsf@uwakimon.sk.tsukuba.ac.jp> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1422840931 8420 80.91.229.3 (2 Feb 2015 01:35:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 01:35:31 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org, Andreas Schwab , joakim@verona.se, Dmitry Gutov To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 02:35:26 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 1YI5vB-0002V5-U2 for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 02:35:26 +0100 Original-Received: from localhost ([::1]:52530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI5vB-0003hD-7D for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 20:35:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI5v7-0003h7-Kg for emacs-devel@gnu.org; Sun, 01 Feb 2015 20:35:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YI5v6-0000tJ-SA for emacs-devel@gnu.org; Sun, 01 Feb 2015 20:35:21 -0500 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:33937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI5v3-0000sz-IT; Sun, 01 Feb 2015 20:35:17 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 5CF901C3835; Mon, 2 Feb 2015 10:35:14 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 452041A2CF1; Mon, 2 Feb 2015 10:35:14 +0900 (JST) In-Reply-To: <87egq98m7w.fsf@engster.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" acf1c26e3019 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:182224 Archived-At: David Engster writes: > > But only because he merged from master, which was wrong to begin with. > > It's a very easy mistake to make, and I'd rather say it is wrong that > Git defaults to fast-forward merges. If you don't like this default, write a better VCS that takes over the world, or volunteer to maintain a fork and get Emacs to adopt it. But on second thought I don't understand how this happened. ISTM it should be easy to check accurately for preservation of mainline (the current head in the remote parent should be a leftmost descendent of the proposed new head). I thought that check was already implemented on Savannah? If on wants to, that check can actually be done locally (of course you need to first git fetch the upstream branch, and there is as usual a race condition in the interval until you push).