From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: When do we merge the commits from emacs-25 onto master? Date: Mon, 23 Nov 2015 20:36:50 +0000 Message-ID: Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a114069d4646f1a05253b2ffa X-Trace: ger.gmane.org 1448311032 6640 80.91.229.3 (23 Nov 2015 20:37:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Nov 2015 20:37:12 +0000 (UTC) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 23 21:36:57 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 1a0xr6-0004om-Mp for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 21:36:56 +0100 Original-Received: from localhost ([::1]:34519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0xr7-0006g2-FW for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 15:36:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0xr4-0006fj-Cg for emacs-devel@gnu.org; Mon, 23 Nov 2015 15:36:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0xr3-0004Sa-Fu for emacs-devel@gnu.org; Mon, 23 Nov 2015 15:36:54 -0500 Original-Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:34955) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0xr3-0004SJ-8g for emacs-devel@gnu.org; Mon, 23 Nov 2015 15:36:53 -0500 Original-Received: by lfdl133 with SMTP id l133so37680786lfd.2 for ; Mon, 23 Nov 2015 12:36:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:date:message-id:subject:from:to :content-type; bh=oJmZ71R1NGOz6Lhq83QpX/LfBPPXTkfdq12nfzhj2DU=; b=agG+1R1+63eFrLYwNZC1nNSrJRC+zcAA9neiWekArPyhvP2FuCyRuYZkh6yr8NKkoN 4GqWYgJFF2pg14dp7BQTf3Olhf1MGqYxGgpYHvDCxrs5EIPTTK4c2XORTcgeAPzGRE4n 2cSE0+m2MhwdgQR7dImh9GnqfT2XVKA/+Mlp76ADHxeDPIesKHW3LLbn3iohU5ktvf8+ tHGUOO8D+twmdd4zJazHoPMWRv7dqemjR4g3YpxjohXVCTVFznSvg9oaUK66IDZeVyQE SM3Nz+MDJkKY+jBLrCGfZ4m30KBTWhl3S7m0M/mLDLvxEK1zXnbQikv/CdRP3ot1mkqe F71A== X-Received: by 10.25.19.69 with SMTP id j66mr11887422lfi.25.1448311011959; Mon, 23 Nov 2015 12:36:51 -0800 (PST) Original-Received: by 10.112.202.99 with HTTP; Mon, 23 Nov 2015 12:36:50 -0800 (PST) Original-Received: by 10.112.202.99 with HTTP; Mon, 23 Nov 2015 12:36:50 -0800 (PST) X-Google-Sender-Auth: _vQ5sk9B7TyKVcxQTHDyPeBCnDI X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c07::22e 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:195143 Archived-At: --001a114069d4646f1a05253b2ffa Content-Type: text/plain; charset=UTF-8 I recently fixed a package.el bug on the emacs-25 branch, but it's affecting a lot of people who are following master (and a lot of automated tests out there run on master) so I'd like the fix to be applied on master too. Do we periodically merge stuff from the emacs-25 branch onto master? Or do we merge only once (when the release is finalised)? --001a114069d4646f1a05253b2ffa Content-Type: text/html; charset=UTF-8

I recently fixed a package.el bug on the emacs-25 branch, but it's affecting a lot of people who are following master (and a lot of automated tests out there run on master) so I'd like the fix to be applied on master too.

Do we periodically merge stuff from the emacs-25 branch onto master? Or do we merge only once (when the release is finalised)?

--001a114069d4646f1a05253b2ffa--