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: master 2d7f4d9 12/15: ; Merge from origin/emacs-25 Date: Tue, 12 Jan 2016 08:23:17 -0800 Message-ID: References: <20160112070839.6841.77764@vcs.savannah.gnu.org> <87y4bvw2lk.fsf@gmx.de> <83h9iikda2.fsf@gnu.org> Reply-To: John Wiegley NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452615820 13117 80.91.229.3 (12 Jan 2016 16:23:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2016 16:23:40 +0000 (UTC) Cc: Michael Albinus , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 17:23:33 2016 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 1aJ1jI-0007dn-KQ for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 17:23:32 +0100 Original-Received: from localhost ([::1]:32938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ1jH-0000Yo-RY for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 11:23:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ1jE-0000YC-PD for emacs-devel@gnu.org; Tue, 12 Jan 2016 11:23:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJ1jD-0003F5-QN for emacs-devel@gnu.org; Tue, 12 Jan 2016 11:23:28 -0500 Original-Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:36510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ1j8-0003E2-KP; Tue, 12 Jan 2016 11:23:22 -0500 Original-Received: by mail-pa0-x232.google.com with SMTP id yy13so249439156pab.3; Tue, 12 Jan 2016 08:23:22 -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:reply-to:mail-followup-to:mime-version:content-type; bh=W4pagVyoo5Tm87/uNgwzkrg6bxnwGy4AiN2eLNaaBxs=; b=d12XXSa/0X0D4VDjs4FABQCUKU8yRS/h58DicEVTC+O2Xvlznzb7EJ1ubHvPCiEmId muAOoNDMZSFzy4g+OpIHcu3vGGEhhnYos3T76QmF/1wGO8MWsm7IZizd0SSqJmsbMehU DKPJJU7FIywN/Hdn11TfaJ3otZSvf4rf26aQOlKIAS/YRBwJsYzknlyDbCvV/uieoXqY fxJg/+H+MVGCWjZXfYYQzO8zpoKZHsijv3xSV1JlS/Jm6U2uBu2uSGEa6DK2CM5+zBIi r3CRFuxtArqq+as6LClGCVo3d29edqWvEbdlly99JWSr08dLAPOIar+zcKit+72YnkCz eD4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:in-reply-to:date:message-id :references:user-agent:reply-to:mail-followup-to:mime-version :content-type; bh=W4pagVyoo5Tm87/uNgwzkrg6bxnwGy4AiN2eLNaaBxs=; b=mk8/Gi7XBfRjPtiGtlB/k7FDnyqHBv/h8zTnlFoVfa/tkqTmk9+qyS3we841PzbCey BwzIG1WRjbIxLMEeJxwmplC+vE/UEsHTgq1u2H2ESD28C9vQZtizod30c3A/RkoOXtEU Tmo7sSN8SIa4SIVmtG9lqc9F9V0TjMSDJCWLYakvV5Mjpg/xrDQ7Yhs5loVaxgW4qRUE nHdnv/14932aXjFQbD+V9gjzSqX/NfWLqu4KvEI3Nc+z3f6RCDa9isIleD+iPRp+iORS CZexZbvKHESx+auU4nP7jHVHBtNXGdzhVeMcK886uYBSQ+zb/0xuak38I91LaFUz11lb 69bQ== X-Gm-Message-State: ALoCoQlaU8y0ZllKaMkreqsq2wowWlYtn9NtVsbnmh7UGZ1poKi/RsWVT9pPzybWGS43X1Tp+zIGUAyWixBR3gvvdgkzHDcuLg== X-Received: by 10.66.102.97 with SMTP id fn1mr192141915pab.131.1452615801894; Tue, 12 Jan 2016 08:23:21 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id 3sm31490434pfb.64.2016.01.12.08.23.20 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Jan 2016 08:23:21 -0800 (PST) X-Google-Original-From: John Wiegley Original-Received: by Vulcan.local (Postfix, from userid 501) id 5D088123BBFA4; Tue, 12 Jan 2016 08:23:20 -0800 (PST) In-Reply-To: <83h9iikda2.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 12 Jan 2016 17:50:29 +0200") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: Eli Zaretskii , Michael Albinus , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::232 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:198084 Archived-At: >>>>> Eli Zaretskii writes: > John, why were those skipped? Did you bump into prblems trying to merge > them? Does gitmerge.el need some work? I did run into a conflict, where master had deleted a Makefile target, and emacs-25 had added a target. I had thought incorrectly that master was right. This will continue to be a danger while I'm still not as familiar with the code as I need to be to know the right resolutions. What I can do is consult first with the commit authors when I run into conflicts that are not obvious. > It's not a catastrophe to have to make several merges by hand, but I think > we should in general avoid that, as doing too many of those is error-prone. That should be the only misfire on this merge. The other changes were simpler, and there were few conflicts. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2