From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Fri, 13 Nov 2015 14:57:56 -0800 Message-ID: References: <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> <8737wgw7kf.fsf@lifelogs.com> <87io5bv1it.fsf@lifelogs.com> <87egfzuwca.fsf@lifelogs.com> <876118u6f2.fsf@lifelogs.com> <87io56qgid.fsf@lifelogs.com> <838u61g0sr.fsf@gnu.org> <837fllg06m.fsf@gnu.org> <836115fyw4.fsf@gnu.org> <83ziyhej4f.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447455496 2107 80.91.229.3 (13 Nov 2015 22:58:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 22:58:16 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 13 23:58:16 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 1ZxNIL-0005bW-0o for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 23:58:13 +0100 Original-Received: from localhost ([::1]:55657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxNIK-0008A6-HP for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 17:58:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxNIH-00088o-CZ for emacs-devel@gnu.org; Fri, 13 Nov 2015 17:58:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxNIG-00070v-IH for emacs-devel@gnu.org; Fri, 13 Nov 2015 17:58:09 -0500 Original-Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:33249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxNIC-0006ze-JY; Fri, 13 Nov 2015 17:58:04 -0500 Original-Received: by pabfh17 with SMTP id fh17so113385361pab.0; Fri, 13 Nov 2015 14:58:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version:content-type; bh=GYQsmu45ouNdWdAq4C4WGcx24jQ02OSVZfaj7T6HHd4=; b=IjEs6jFalWAml0f5AJrqs6pEWG1x54aOLzSrrYDNGyP/SdXImOALDArFcEeFxZq8QK nz0YESCql/ORc8loYt6TyPfZ0Mxm4gtN8IWJbFcVRQtI7Gjt0VFbA5v2u9h+CFmS/NKk 9gCKU8Rpdv/g2KBIzmERWN7XRNA2PkJzcksxbgD7VzL355J2w2mY5FrMoaL0gKTXSMrO wR5L1m2q7LUY1J9kJuOSs/xN3hqP81ECQNa+X8Uaesu3msJdub2yZ3h2Er3vSA53nmm9 58vAL1ZtB1ntc9RFd+MZ3mnL0bFsAA2/91xewRmJ360LKD/JXE4583jnnkXKrSqbfi2/ njCQ== X-Received: by 10.68.129.133 with SMTP id nw5mr35460652pbb.18.1447455483633; Fri, 13 Nov 2015 14:58:03 -0800 (PST) Original-Received: from Vulcan.attlocal.net (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id xr8sm15971007pab.26.2015.11.13.14.58.01 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 13 Nov 2015 14:58:02 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.attlocal.net (Postfix, from userid 501) id 1CDEB105B4125; Fri, 13 Nov 2015 14:58:01 -0800 (PST) In-Reply-To: <83ziyhej4f.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 13 Nov 2015 22:31:44 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (darwin) Mail-Followup-To: Eli Zaretskii , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22f 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:194422 Archived-At: >>>>> Eli Zaretskii writes: > We should now change master to identify itself as version 25.1.50 or maybe > even 26.0.50. OK? Let's go with 25.1.50 for now. Next time we'll coordinate better to avoid the cherry-picking. The merge commit you'll see today is because I didn't read these messages until after doing it, but it should have had very little impact. We also have about 12 commits of replicated history, but that's the price of learning. FWIW, I don't believe "directionality" matters to Git, until you have changes on one branch you don't ever want to see on another. Since the freeze hadn't happened yet, it should have been OK to unify the branches in either direction. John