From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Tue, 27 Jan 2015 23:16:02 -0800 Organization: UCLA Computer Science Department Message-ID: <54C88CB2.1030608@cs.ucla.edu> References: <20150128032211.21589.96959@vcs.savannah.gnu.org> <87mw53zijz.fsf@building.gnus.org> <54C883B8.6050506@cs.ucla.edu> <87twzbv1x0.fsf@building.gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1422429374 25410 80.91.229.3 (28 Jan 2015 07:16:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 28 Jan 2015 07:16:14 +0000 (UTC) Cc: =?UTF-8?B?RmFiacOhbiBFemVxdWllbCBHYWxsaW5h?= , emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 28 08:16:13 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 1YGMrD-0000Op-By for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 08:16:11 +0100 Original-Received: from localhost ([::1]:51623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMrC-0000cx-Qv for ged-emacs-devel@m.gmane.org; Wed, 28 Jan 2015 02:16:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMr9-0000cr-QI for emacs-devel@gnu.org; Wed, 28 Jan 2015 02:16:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGMr6-00014x-Ie for emacs-devel@gnu.org; Wed, 28 Jan 2015 02:16:07 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:54908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGMr6-00014j-AL; Wed, 28 Jan 2015 02:16:04 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 8F67AA6006C; Tue, 27 Jan 2015 23:16:03 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x18+Onw0NS0p; Tue, 27 Jan 2015 23:16:03 -0800 (PST) Original-Received: from [192.168.1.9] (pool-173-55-11-52.lsanca.fios.verizon.net [173.55.11.52]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 1A062A60036; Tue, 27 Jan 2015 23:16:03 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 In-Reply-To: <87twzbv1x0.fsf@building.gnus.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 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:181882 Archived-At: Lars Ingebrigtsen wrote: > 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-2= 4 > branch... Oh, sorry, I guess I misinterpreted the logs and Fabi=C3=A1n did the merg= es=20 (actually, merges) at about the same time? But your name is on one of th= e=20 master-installed merges as the committer, so I'm puzzled. Whatever. Any= way,=20 the merges had quite a few conflicts that were resolved incorrectly. Did anything leak into the master that you didn't want? The nnimap `neve= r'=20 expiration fix, say? (Commit 0cdd599c54aeda36e7e0696b2f90d2c286153a1d.) = Or the=20 shr-make-table-1 patches (commits 1a369fc7f1ccec6954344ec1ee0211a4d24c312= d and=20 776705f49c5cb4e66c7dcb316fe499aa6a183888)? If so, now might be a good ti= me to=20 revert these. As a general rule, by the way, I almost never do anything other than "git= pull"=20 when I'm in my working copy of the Emacs master. To do any real work, I = clone=20 that copy and work in some temporary branch in that clone. Eventually wh= en I=20 have a patch I'm happy with, I use "git format-patch" to create a patch f= ile,=20 review the patch file, and then finally go to my copy of the master and p= ublish=20 the patch via "git am PATCHFILE; git push". This lessens the likelihood = of my=20 inadvertently pushing something to savannah's master.