From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: Code reviews Date: Wed, 09 Mar 2016 15:09:35 +0000 Message-ID: <87wppb3cy8.fsf@russet.org.uk> References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> <83vb50wxhv.fsf@gnu.org> <87y49vz4cg.fsf@acer.localhost.com> <87vb4zb0i4.fsf@gnu.org> <837fheuu6a.fsf@gnu.org> <877fheb1rh.fsf@wanadoo.es> <87ziua9mwq.fsf@wanadoo.es> <83h9git36k.fsf@gnu.org> <87vb4y9ep9.fsf@wanadoo.es> <83a8mat2aa.fsf@gnu.org> <87r3fm9du0.fsf@wanadoo.es> <878u1tuzgn.fsf@russet.org.uk> <83d1r5rlxw.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1457536217 22024 80.91.229.3 (9 Mar 2016 15:10:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Mar 2016 15:10:17 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 09 16:10:07 2016 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 1adfkL-00022H-43 for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 16:09:57 +0100 Original-Received: from localhost ([::1]:42034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adfkK-0001by-Is for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 10:09:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adfk5-0001aM-0P for emacs-devel@gnu.org; Wed, 09 Mar 2016 10:09:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adfk4-0004h3-7C for emacs-devel@gnu.org; Wed, 09 Mar 2016 10:09:40 -0500 Original-Received: from cloud103.planethippo.com ([31.216.48.48]:39512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adfk0-0004fi-8q; Wed, 09 Mar 2016 10:09:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=JPwdxEfjFwd98SPUix7Y+2uAldF4qt19uJZQC89CoOA=; b=ZfTQ8BVzrHKTSwsudF1gi7lWZt nSoR1wNa/qAYAD7m5joKLeySOUEWrlATN67OS9FYrusJIphuhRStMLBzc6ltD6kCWRPNMRouS6pcY wB2n9PdYy+M2zGk4PkXhJlcGpsu6/Dbv9NUnIawuPGiEXdRM7vEri9bnupC7yFLbAyXu/dHpslx3s XpTdY1u/gebw92gY8E8XddQ+xcuuEnN/btC0tjDadUWOlMYlsf+zQNRI9Vjnh3FenhpEtkb3ylPyF ecZdDGs/d58uSbBu48Z48QGH1xZ9+diTsLHANtcjnaEj65XcfUz/UbpciZ92WYha0mCJ33P6PgM/F ABBaTIag==; Original-Received: from janus-nat-128-240-225-60.ncl.ac.uk ([128.240.225.60]:60956 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86) (envelope-from ) id 1adfjz-0036Ji-Hc; Wed, 09 Mar 2016 15:09:35 +0000 In-Reply-To: <83d1r5rlxw.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 08 Mar 2016 18:09:15 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 31.216.48.48 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:201243 Archived-At: Eli Zaretskii writes: >> From: phillip.lord@russet.org.uk (Phillip Lord) >> Date: Tue, 08 Mar 2016 08:48:56 +0000 >> Cc: emacs-devel@gnu.org >> >> Giving people different permissions on different branches seems to make >> sense. Overtime, people move toward master/emacs-25. > > AFAIK, Git (or is it Savannah?) doesn't support such granularity. Yes, it does, through hooks. I think, most people just use gitolite for the purpose. >> > Maybe we could have a half-way system, where commits are pushed to >> > a branch that is "not fast-forward-only", and this branch is then >> > auto-merged to the real (fast-forward-only) master branch after a delay >> > (one day, maybe?) to give time to fix mess ups before they're cast >> > in stone. >> >> I think that this would require some considerable co-ordination. If I >> push a broken commit to devel branch, and then you fix this commit >> through rebase, my copy of the branch (and everyone elses) is now >> broken. > > Stefan was talking about merging, not rebasing. I think he was talking about both. "fix mess ups" sounds like a rebase to me. But I was confused about his overall workflow. Phil