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 18:20:27 +1100 Message-ID: <87iofrv0as.fsf@building.gnus.org> References: <20150128032211.21589.96959@vcs.savannah.gnu.org> <87mw53zijz.fsf@building.gnus.org> <54C883B8.6050506@cs.ucla.edu> <87twzbv1x0.fsf@building.gnus.org> <54C88CB2.1030608@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1422429769 31735 80.91.229.3 (28 Jan 2015 07:22:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 28 Jan 2015 07:22:49 +0000 (UTC) Cc: =?iso-8859-1?Q?Fabi=E1n?= Ezequiel Gallina , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 28 08:22:48 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 1YGMxa-0000Ba-VY for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 08:22:47 +0100 Original-Received: from localhost ([::1]:51633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMxa-0002lo-Bw for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 02:22:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMxN-0002lX-Fe for emacs-devel@gnu.org; Wed, 28 Jan 2015 02:22:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGMxM-0003RB-E2 for emacs-devel@gnu.org; Wed, 28 Jan 2015 02:22:33 -0500 Original-Received: from smtp.syd.comcen.com.au ([203.23.236.77]:4568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMxI-0003QM-Ef; Wed, 28 Jan 2015 02:22:28 -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 t0S7KWYs047735; Wed, 28 Jan 2015 18:20:33 +1100 (EST) In-Reply-To: <54C88CB2.1030608@cs.ucla.edu> (Paul Eggert's message of "Tue, 27 Jan 2015 23:16:02 -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:181883 Archived-At: Paul Eggert writes: > Oh, sorry, I guess I misinterpreted the logs and Fabi=E1n did the merges > (actually, merges) at about the same time? *phew* For a while there I thought my comprehension of git was even lesser than it is. :-) > But your name is on one of > the master-installed merges as the committer, so I'm puzzled. > Whatever. Anyway, the merges had quite a few conflicts that were > resolved incorrectly. > > Did anything leak into the master that you didn't want? The nnimap > `never' expiration fix, say? (Commit > 0cdd599c54aeda36e7e0696b2f90d2c286153a1d.) Or the shr-make-table-1 > patches (commits 1a369fc7f1ccec6954344ec1ee0211a4d24c312d and > 776705f49c5cb4e66c7dcb316fe499aa6a183888)? If so, now might be a good > time to revert these. Those two look OK, I think. --=20 (domestic pets only, the antidote for overdose, milk.) bloggy blog http://lars.ingebrigtsen.no/