From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Barry Fishman Newsgroups: gmane.emacs.devel Subject: Re: Next release from master Date: Fri, 22 Jan 2016 16:27:33 -0500 Message-ID: References: <8qegda3kfg.fsf@fencepost.gnu.org> <56A185D8.9030807@yandex.ru> <56A18A70.2060409@yandex.ru> <83powu6pdg.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1453498134 8857 80.91.229.3 (22 Jan 2016 21:28:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 22 Jan 2016 21:28:54 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 22 22:28:46 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 1aMjG8-0005eH-TP for ged-emacs-devel@m.gmane.org; Fri, 22 Jan 2016 22:28:45 +0100 Original-Received: from localhost ([::1]:55585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMjG8-0003FZ-DP for ged-emacs-devel@m.gmane.org; Fri, 22 Jan 2016 16:28:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMjFD-0001qB-16 for emacs-devel@gnu.org; Fri, 22 Jan 2016 16:27:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMjF9-0002mc-QZ for emacs-devel@gnu.org; Fri, 22 Jan 2016 16:27:46 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:56492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMjF9-0002mR-Jx for emacs-devel@gnu.org; Fri, 22 Jan 2016 16:27:43 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1aMjF8-00057h-0Y for emacs-devel@gnu.org; Fri, 22 Jan 2016 22:27:42 +0100 Original-Received: from fl-71-48-237-75.dhcp.embarqhsd.net ([71.48.237.75]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 22 Jan 2016 22:27:41 +0100 Original-Received: from barry by fl-71-48-237-75.dhcp.embarqhsd.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 22 Jan 2016 22:27:41 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 60 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: fl-71-48-237-75.dhcp.embarqhsd.net Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAALVBMVEXG87t8xXThBQWq85q9 87AvUC6PUVH/BgamyajC87a/87P////r6+ud7oq49KsBy7dJAAACKUlEQVQ4jc3Sv2vbQBQH 8CulwcEdeoOKwM1QD/bSzVktKDEdMpRqeMKQFNqAhEGbh3aVB5sDafAYL106xZMzuAiehnqI EciLMR2viz0Vor+hdydZMa6z97sI9NH7cYdI9ZGQr4/kP4Fu1akehFqHDaoHoOviPLD3oVtz 7PIErFCeeRdqOuvptwDMYSyfpKB7iYh3DOCTeOKzegGvk8hD1O22eD2B9tUWum9wbpXYy6NA wAzMeQFu1AeT2VAW0Af4sYUvfmRbCWLciXq0B2ZYf4C+GL/AGBIcOP4O4MzFKbiTAGOPYg7V mu1j5OIdfIgT7FtHGKoZIHKB6IuK9kDODpNsK0pPVnqCFbyFSyYWMMPnIA9CVsbm5l2HuRjZ FVERBXFPs8QQMhIZvqUX8jJmiTzIRy5FwWhEdAmR4y1KnQbn1KrnMOrLj6PPDnW8bw2+1K7I OINrecF9jwyJyBlfAvkzvlEy6DBHJ3m+8yU5HY9V0TWl+nALx+slMQTkRWKHQprEOJeST3qg p8RoHZRjsmm1ctrrJ0HkX0mFvG+uTnf7qe3SNG2dcc4bm70iAemaHxAJ91zF2G2noMl/UVVk bAoihgINlKwa6XkuhBsKGJgnPBuVEeG/5Wzqz3tZ0bYh4SsBS+qXZtTMRTWUcC/Bnybi7+R5 VoaAdZNz7ZU/RT8u2nEuQTw0VpmjH/7UChHQlFAGT1Rg8GS7Hcm+0F4EDgvYIohLAFS++wvs R0Pau3fdJgAAAABJRU5ErkJggg== User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.1.50 (gnu/linux) Cancel-Lock: sha1:PSidTuP0wAb+7dGnTIJMJYXMUuY= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:198604 Archived-At: On 2016-01-22 09:45:54 -0800, John Wiegley wrote: >>>>>> Barry Fishman writes: >> I think you all are making things more difficult for yourselves. > > Hi Barry, I didn't really understand your e-mail; it sounded just as difficult > as anything else that's been proposed. Could you summarize what exactly would > make it an easier solution? > > In a sense "emacs-25" is the current master for our developers, with "master" > collecting new features that we reject as too destabilizing for emacs-25. When > we are done with "stabilizing mode", we'll go back to "feature mode", and > master will resume its role as master. We both seem to agree that the numbered "emacs-25" type branches track the development of each release. I suggested branches not have modes. "Master" would always be where the major testing occurs. "Next" would be were new, possibly destabilizing changes could be made. Numbered branches would always contain the history associated with that release. When developers work on feature that are destabilizing, these get merged into a "next" branch, hopefully when they have initially tested them in there own local branch. "Next" would be where integration testing is done. When "emacs-25" is considered complete, in the sense that the next release would be in "emacs-26", The next branch goes though the process of merging into master for final testing and bug fixes. When ready it it branched as the "emacs-26" release. At worst this is just a relabeling of the current "master" to "next", and move the "emacs-25" development to master. But it makes the mainline development process more linear. "Master" would be where most of the bug testing is done, so people who want to help out testing Emacs but are not major developers could go and help. General users finding bugs could see there fixes done there. Being "master" it would be the easiest for people to track and build. People working on next would be more seasoned developers involved integrating new features and doing the more complex debugging. No matter what approach is used, I think the major revision time merge of "next" and "master", (or currently "emacs-25" into master) needs to be done carefully. I just think that what is going on in each branch should the established, rather than a cycling though modes. I also think that making the "master" branch less volatile and always the current test area would help open up the bug fixing to a wider audience who may have less Git skills. People who hope to generally contribute to bug fixing need only clone the Git repo and use that. Irrespective of what the policy is, I think you will find most people that check out Emacs build from the master branch. -- Barry Fishman