From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: Issues running gitmerge Date: Tue, 22 Aug 2023 09:03:17 +0800 Message-ID: <87sf8banxm.fsf@yahoo.com> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40585"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Jim Porter Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Aug 22 03:04:18 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qYFoe-000AKa-9v for ged-emacs-devel@m.gmane-mx.org; Tue, 22 Aug 2023 03:04:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYFnz-0002Vz-2A; Mon, 21 Aug 2023 21:03:35 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYFnw-0002Vq-My for emacs-devel@gnu.org; Mon, 21 Aug 2023 21:03:32 -0400 Original-Received: from sonic306-22.consmr.mail.ne1.yahoo.com ([66.163.189.84]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYFnu-0006gB-CK for emacs-devel@gnu.org; Mon, 21 Aug 2023 21:03:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1692666207; bh=mCnBbrwcfdXoBZRui571Aq2wQjJeXCJHaviAivZCJ0s=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=qAKW+4rdSsd28pXfemJk+jg3hI+pt426pATy0qmqYgFLr41gWxhAXL5kTZTmHflpkuWMDpDkJYxzBQ7sYMxcIXD0RaA5o0N7HitWfecWHwQBPcakr1mLX0LpunMs2ucOh8ANLtxv3xQqoZQZwbkNe/7JZ6dt1g13xVA3nl7iWAerXflNuqka2OK+Itaus+E6O3ZGyKJulvdv2X4jNG7pQGaKthgT3V30YxUagJj29Pd2xLc5Cjqxuh/1e9SsZW68+Homsm8Tmps9S+xyYGhTQcUCbj4I1Prc9UemUb6NFAvvEDEwnfnG/ko7qI8deBJHWq4c2oLkpjJ7RDxjN7O3IA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1692666207; bh=n5EmmF9P4B8rirxFLN17erVAtmarua9rY+PDVHMzPXX=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=AwbBQTMk0oIRuCqtfxcjUkaSExscDdqr+uX+pxKaKTti/OBGbEUcEfkLmkXEy1Jb33J1B/fEBCCk2iqCSXWoPcgifd/iYkhvAMns3XlliqXIs0cRFN+BFxs/o8ud9wQhyB2bRwkFn9FvtcwMWX72fppDiaQznUxQkyZ8twpagFqRhkZ/1H7liuNGeuQmzyffQZ5hiFHOx0cQouB0FV6MO4sR6QVLd9SK4n61kSMAZDGazr0sIxwC1xbn94bmMGzySh2huBmRwlnYdrzZ6zPlVy1T1P8iKoHFS2DVChsVOcsam926yW19Q6mKaFBFj+VVUn/StsrmAeFmpEzUetBIOQ== X-YMail-OSG: DQG4ZA0VM1kfStB9XHqcG4nazLrPC6GSlkBP1F3sQaDwFa6wcfSUa.TEMAcSkm9 Ou_zNNO9uMkGA5CpqiIcLPVMREs7nS5iU11bFNAYobHY74ivwCU6kTGiZf4gU3C.8BhSAq.wochG QqW82q7Ozd9sIWFqpwSN9j_F0fxbfF5YsacjT._vgAbwgHtiD7rMYElHh2nqaz0lVhE2I.6TgH6k g8GfCa2hXg7F_9SxVKjZdjIkguJYm9PxvbBRuiUqWrnyolnAxCeXzAOyDNVUYUUdu_XBfoOYqZcO B0aXHOMO8KmE2OVdU9.hgL_589uSMF92J0Uvcejw0oz68w0kNgMRDa46N.x0Y3toNey7zbKRYvFR TruaMokVOuDWf9OyX7FB3AfDuntGKMDqJ.mOetdABb7N2MC1lVJa376X2JU20zlA9xA4J9Su9bN2 npNaGBOoirg5OFYMvmoKqZ0Awv34fP6ghvUmia.aYlqMAC4CEwyH2dj_MiyrV5RYhCIUew0od1W7 CjKDWDnK1IUXss24ihVytzD9BcqFNQI7_RkdZYNAFTx_n1UMV9EIc3eioXIdPOZDkCRa1ivPpphE cL7C4IHg6KlLQCV3Jr.ejzfslROKrOZvIsOOCXzfWq81MaHUZEwREEJxbGpKtqS7NPG_VdYAJSwD JH8NpjB2At_n9WssTRkVC1VKWY4Chsy1YuNGG0Hyfa5UAz47bqE0vZOOtI4.zqs5m04ORcofTTYB 5sbJeszHFjeKPiv6usm1FqNc1HF9AGdwJud9bORhBx0YmCO1MRkVUvtMv.VkYO3AVMlriOzy.blC FE44pHmQfq03wLDa22bRYS9s5OqhNW5KKya832A8LM X-Sonic-MF: X-Sonic-ID: 2f0e1f69-524b-4125-8b29-1fef6eeae93e Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ne1.yahoo.com with HTTP; Tue, 22 Aug 2023 01:03:27 +0000 Original-Received: by hermes--production-sg3-69654d8bd-gltbk (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID e4cd251d8a82f9a2e561013839ef0f5e; Tue, 22 Aug 2023 01:03:21 +0000 (UTC) In-Reply-To: (Jim Porter's message of "Mon, 21 Aug 2023 17:37:57 -0700") X-Mailer: WebService/1.1.21732 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.189.84; envelope-from=luangruo@yahoo.com; helo=sonic306-22.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:309094 Archived-At: Jim Porter writes: > I noticed that it's been about a week since we last ran gitmerge, and > so I attempted it since I have a couple of changes to the Eshell > manual on the release branch that I want to merge into > master. However, running gitmerge fails, I think due to our pre-commit > hook complaining. The failing files are: > > ChangeLog.android > The hook rejects files with ChangeLog in the name, but reports the > wrong error due to a (probable) bug in the hook. ChangeLog.android should be kept. The hook should be fixed. > java/INSTALL > Whitespace "issues" (which are probably non-issues since these are > part of in-line diffs). > > java/README > Extraneous newline at the end. The hook must be taught to ignore these files. > java/res/drawable/emacs_background.xml:30 > Trailing whitespace (probably a real issue) > > The last two are easy enough to fix, but I'm not sure what to do about > the others. Can we tell Git to ignore these problems? Should we fix > them somehow? I'm no expert on the gitmerge process, so maybe I'm just > missing something obvious. I asked this question a week ago, but none of the Git experts who frequent this list replied. I will fix emacs_background.xml.