From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Wed, 28 Jan 2015 17:45:31 +1100 Message-ID: <87twzbv1x0.fsf@building.gnus.org> References: <20150128032211.21589.96959@vcs.savannah.gnu.org> <87mw53zijz.fsf@building.gnus.org> <54C883B8.6050506@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422427644 31203 80.91.229.3 (28 Jan 2015 06:47:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 28 Jan 2015 06:47:24 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 28 07:47:22 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 1YGMPI-0006Uo-VB for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 07:47:21 +0100 Original-Received: from localhost ([::1]:51561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMPI-0002AH-BC for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 01:47:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMP6-0002AC-HD for emacs-devel@gnu.org; Wed, 28 Jan 2015 01:47:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGMP1-0000QO-Hh for emacs-devel@gnu.org; Wed, 28 Jan 2015 01:47:08 -0500 Original-Received: from smtp.syd.comcen.com.au ([203.23.236.77]:3705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMP1-0000QA-0q for emacs-devel@gnu.org; Wed, 28 Jan 2015 01:47:03 -0500 Original-Received: from building.gnus.org ([27.96.197.126]) by smtp.syd.comcen.com.au (8.13.4/8.12.9) with ESMTP id t0S6jZAx042117; Wed, 28 Jan 2015 17:45:36 +1100 (EST) In-Reply-To: <54C883B8.6050506@cs.ucla.edu> (Paul Eggert's message of "Tue, 27 Jan 2015 22:37:44 -0800") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-comcen-MailScanner-Information: Please contact the ISP for more information X-comcen-MailScanner: Found to be clean X-comcen-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=0.102, required 4, AWL 0.00, BAYES_50 0.00, RDNS_NONE 0.10) X-comcen-MailScanner-From: larsi@gnus.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.23.236.77 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:181880 Archived-At: Paul Eggert writes: > This is git, so nothing is ever destroyed, it's just ... mutated. > > I repaired the problems I found in master commit > 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4. Your commit merged from > emacs-24, which is generally a good thing to do, so I left that part > alone. Oops, sorry. How did that happen? I thought I was in either the master branch, or the shr-fontified branch. I didn't try to do anything with the emacs-24 branch... git branch seems to agree: [larsi@building trunk]$ git branch * master shr-fontified [larsi@building trunk]$ cd .. [larsi@building emacs]$ cd shr-fontified/ [larsi@building shr-fontified]$ git branch master * shr-fontified Hm... -- (domestic pets only, the antidote for overdose, milk.) bloggy blog http://lars.ingebrigtsen.no/