From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Sat, 14 Nov 2015 13:57:34 +0100 Message-ID: <87a8qglow1.fsf@isaac.fritz.box> References: <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> <87d1vdfurp.fsf@igel.home> <83wptldn2x.fsf@gnu.org> <87io55km09.fsf@isaac.fritz.box> <83fv09djs1.fsf@gnu.org> <87egfslp1x.fsf@isaac.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447528145 8683 80.91.229.3 (14 Nov 2015 19:09:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Nov 2015 19:09:05 +0000 (UTC) Cc: jwiegley@gmail.com, schwab@linux-m68k.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 14 20:08:55 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 1ZxgBm-0008TY-VX for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 20:08:43 +0100 Original-Received: from localhost ([::1]:36686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxgBm-0005R2-Hg for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 14:08:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxaOm-0000l2-R9 for emacs-devel@gnu.org; Sat, 14 Nov 2015 07:57:45 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxaOj-00089q-Kq for emacs-devel@gnu.org; Sat, 14 Nov 2015 07:57:44 -0500 Original-Received: from randomsample.de ([5.45.97.173]:47666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxaOj-00089m-Eo; Sat, 14 Nov 2015 07:57:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=e9CvWdeVH6Wo0Yj9D5YXxO2Gbo4Zg/mZjPzF/sr8zHE=; b=DaHWYwyxtMKSosnodwXRPY+C4qX+2gsOZExPYjRXudasnmc8C5rjayEwNgs7f6eI/NBDFQsGIBoELCwFQg4P5bwAiktIzqlQ0AI/UlaNWZq5d06rOR41+CwY0G6xRy0Y; Original-Received: from ip4d1645ea.dynamic.kabel-deutschland.de ([77.22.69.234] helo=isaac.fritz.box) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZxaOd-0005VV-LD; Sat, 14 Nov 2015 13:57:35 +0100 In-Reply-To: <87egfslp1x.fsf@isaac.fritz.box> (David Engster's message of "Sat, 14 Nov 2015 13:54:02 +0100") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:194466 Archived-At: David Engster writes: > I see now that master was merged into emacs-25. Is this now the new > workflow? If so, there's not much point in keeping gitmerge.el anyway. Sorry, forget what I said. I forgot the we don't freeze master anymore, so I guess this was a one-time merge just to forward emacs-25. I was just confused because git couldn't detect the cherry-picks, but this is because of this merge from master. -David