From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Sun, 14 Dec 2014 19:50:56 +0200 Message-ID: <83d27m3ytb.fsf@gnu.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <83zjaurreb.fsf@gnu.org> <874mt14wrc.fsf@lifelogs.com> <83egs5rzlr.fsf@gnu.org> <877fxx2e6t.fsf@lifelogs.com> <83a92trlgs.fsf@gnu.org> <87oar81jlp.fsf@lifelogs.com> <87bnn7rkcq.fsf@engster.org> <877fxvri96.fsf@engster.org> <87zjarznzs.fsf@lifelogs.com> <87sigjpri2.fsf@engster.org> <838uib60jv.fsf@gnu.org> <87mw6rpc6l.fsf@engster.org> <83sigj48z5.fsf@gnu.org> <874mszp2i7.fsf@engster.org> <83iohe43hu.fsf@gnu.org> <548DCCE4.905@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418579506 27465 80.91.229.3 (14 Dec 2014 17:51:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 14 Dec 2014 17:51:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 14 18:51:39 2014 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 1Y0DKS-0003h4-UO for ged-emacs-devel@m.gmane.org; Sun, 14 Dec 2014 18:51:37 +0100 Original-Received: from localhost ([::1]:36731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0DKS-0006Yh-Gp for ged-emacs-devel@m.gmane.org; Sun, 14 Dec 2014 12:51:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0DKB-0006YP-1g for emacs-devel@gnu.org; Sun, 14 Dec 2014 12:51:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0DK5-0002zP-Sl for emacs-devel@gnu.org; Sun, 14 Dec 2014 12:51:18 -0500 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:41205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0DK5-0002zL-Kj for emacs-devel@gnu.org; Sun, 14 Dec 2014 12:51:13 -0500 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NGL00J002TCIF00@mtaout26.012.net.il> for emacs-devel@gnu.org; Sun, 14 Dec 2014 19:50:16 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NGL00H2A2VSI820@mtaout26.012.net.il>; Sun, 14 Dec 2014 19:50:16 +0200 (IST) In-reply-to: <548DCCE4.905@cs.ucla.edu> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:180099 Archived-At: > Date: Sun, 14 Dec 2014 09:46:12 -0800 > From: Paul Eggert > CC: emacs-devel@gnu.org > > Eli Zaretskii wrote: > > perhaps we need to radically rethink > > our recommended project workflow, like not base it on merges but on > > rebase, or push fixes to master and then cherry-pick them to the > > release branch, or something else > > Part of the problem is the mundane business of maintaining ChangeLogs by hand, > an error-prone process with merges. We're planning to fix this (currently > scheduled for next month) by generating ChangeLogs automatically. Perhaps once > we've done that the remaining problems with merging will be so small that we can > just live with them. I'm not sure. The problem of using incorrect Git commands in the case that triggered this discussion was unrelated to ChangeLogs. > (The particular problem Ted ran into seems pretty complicated; I'm > not sure it's a good use case for us when designing our development > workflow.) People are running into problems all over. It's not just Ted and not just that particular push. > More fundamentally there's the issue of how much we want commits to be > serialized. That is, do we want development history to look as if it was done > one commit at a time in a single branch? If so, merges are not the way to go, > because they're DAG-based. That's what I was asking, in different words.