From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 21:39:17 +0200 Message-ID: <54CE80E5.2090205@yandex.ru> 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=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1422819586 19769 80.91.229.3 (1 Feb 2015 19:39:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 19:39:46 +0000 (UTC) Cc: Eli Zaretskii , joakim@verona.se, emacs-devel@gnu.org To: David Engster , Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 20:39:41 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 1YI0Mv-0002gs-AG for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 20:39:41 +0100 Original-Received: from localhost ([::1]:51700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0Mu-0005fe-KD for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 14:39:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0Mh-0005fW-Mh for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:39:28 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YI0Me-0005B6-Gi for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:39:27 -0500 Original-Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:47822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0Me-0005B2-9Z; Sun, 01 Feb 2015 14:39:24 -0500 Original-Received: by mail-wi0-f178.google.com with SMTP id bs8so11463881wib.5; Sun, 01 Feb 2015 11:39:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=dWkKboMhSFC1N7rvdQ0DWr/tM3Ioxj76CgteHRluLLc=; b=Mr/rG0UagcCIL5wkKnIWM6miWANPzT5AZentUttUKFhyZby5R0EXpJ/olSrtsVt6UT 92UfBlLFsw2RW6R2T33ocp8mMyYmnZapyz/7f/W/2+RMnV/HDzaWilgr2gDzkI2i3huE wbVSiuJyufWL+95kbbSXyNVlQQwPpUGINYz6XB8G1oJk8BUFBTy5E42FBtlYo2Am42Ih bwUaHQIBzxwscA/MtRhvldncfABeEr2KXzDX0ZrqM/UbMolFOLUKu2/ZPPN+iwfwtjgd ixjKvGS9WAp61MB8bq7PkzozwRK1CCqlpzI7DYP1KPAVALQi6bnZ8QXLQl4fy5IVu+yc jbgg== X-Received: by 10.180.20.177 with SMTP id o17mr16775314wie.20.1422819563661; Sun, 01 Feb 2015 11:39:23 -0800 (PST) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id i4sm24534095wje.20.2015.02.01.11.39.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Feb 2015 11:39:23 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:33.0) Gecko/20100101 Thunderbird/33.0 In-Reply-To: <87egq98m7w.fsf@engster.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::232 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:182205 Archived-At: On 02/01/2015 09:29 PM, David Engster wrote: > It's a very easy mistake to make, and I'd rather say it is wrong that > Git defaults to fast-forward merges. Maybe admin/notes/git-workflow should have a section about feature branches, and prescribe 'git merge --no-ff' when merging a long-running feature branch. However I wouldn't say that the forest of merges if the biggest problem we have. At least a sufficiently smart script can filter out those.