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: What's the difference between the `emacs-25' branch and `master'? Date: Thu, 14 Jan 2016 00:34:55 +0300 Message-ID: <5696C2FF.6060802@yandex.ru> References: 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 1452720910 13501 80.91.229.3 (13 Jan 2016 21:35:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Jan 2016 21:35:10 +0000 (UTC) To: Zack Piper , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 13 22:35:05 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 1aJT4K-00014c-RW for ged-emacs-devel@m.gmane.org; Wed, 13 Jan 2016 22:35:04 +0100 Original-Received: from localhost ([::1]:39280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJT4K-0007LD-33 for ged-emacs-devel@m.gmane.org; Wed, 13 Jan 2016 16:35:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJT4G-0007Kk-Qs for emacs-devel@gnu.org; Wed, 13 Jan 2016 16:35:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJT4D-0003zZ-Id for emacs-devel@gnu.org; Wed, 13 Jan 2016 16:35:00 -0500 Original-Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]:36142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJT4D-0003zV-As for emacs-devel@gnu.org; Wed, 13 Jan 2016 16:34:57 -0500 Original-Received: by mail-lf0-x233.google.com with SMTP id h129so69068711lfh.3 for ; Wed, 13 Jan 2016 13:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=iEZsdeHeti7fcMlZhIbRJbqkWI3LEx01hKoMLSPDKao=; b=riYMgJX0hwWWGWkvrkfRW0zsZ+XWX+H4Oqbvn+p/Zth7dWZCMqUDNMDsMtMs5sSvms 940/WvBEdDMmR4sQamgbK/CW+eoXRN9keQZLhh1iHP02XMJJAE6rYPQf6Byfgic0EP3V WMGJuLIbg9cZ056iJqnDM64rZODuUMRDWI6Gh+aVXSTuo82BxdcZaqtktcIo5XMifIwB YPDyep2DmnJaC1nJKw7fs5I+m9QUO0FTA9l8y4hFQOPqlne5esf/UkdzSZvX/rJ9dHmp v39KjrgE9srngpY+JNYEMpJrEmTyi5lFEKgY+ztmRxj4rfrJKCOeFjkmIc9gqYl2jI0m VwFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=iEZsdeHeti7fcMlZhIbRJbqkWI3LEx01hKoMLSPDKao=; b=MrLzou9pFPhEEsYRLngE86RIBF20XiFZn0XUNdfezC1VYCZv3QajIkfO5B+on8tX84 2agV7+b63aH78vRQh9gH5Sdg3wQrPWG9USudhgcFtKZeC1eeQvAr+P9+cWcTmlF/cQly aTl1L2sf9REoPN0qXs3a7VHEf3/BBOWhX83BdyMnGJkPCc565LaXeNh1YCgdjyAum7c6 eUA6+3fOH2XCordkaLNm2jJ19jP2d20gAcNzwmzRrIl2V+/qE8VIMSipzXmCiuOlX1OC /eqR2zIkU+DWyppJPlXiiIJqLaSHd1FuSkejCdMBA5PhiVtMDE1Q3gFpKeGTDTThLFJB HMxA== X-Gm-Message-State: ALoCoQnZClz+1D7bvPqSnl/a6IX7CTSkKtt9GE+CsV+sZ3o4Vn51y0MQvh5cLj+r88oyVMgrPWPxHTkHIEkx0qB+MqTjp5zxqQ== X-Received: by 10.25.83.193 with SMTP id h184mr167153lfb.6.1452720896443; Wed, 13 Jan 2016 13:34:56 -0800 (PST) Original-Received: from [192.168.1.190] ([178.252.127.222]) by smtp.googlemail.com with ESMTPSA id rg10sm405053lbb.11.2016.01.13.13.34.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Jan 2016 13:34:55 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:43.0) Gecko/20100101 Thunderbird/43.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::233 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:198115 Archived-At: On 01/14/2016 12:19 AM, Zack Piper wrote: > I'm wondering what the purposes of the emacs-25 branch is, the > emacs-25 branch was merged into master quite recently but commits > still appear to be showing up in emacs-25, so what exactly is the > difference? emacs-25 will become Emacs 25.1 See "Branches" in http://git.savannah.gnu.org/cgit/emacs.git/tree/CONTRIBUTE?h=emacs-25 > Sorry if this has been asked before. A few times.