From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.devel Subject: Re: Issues running gitmerge Date: Mon, 21 Aug 2023 18:28:03 -0700 Message-ID: <98016d0e-9bb4-55e7-0464-07540a2352b6@gmail.com> References: <87sf8banxm.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36883"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Aug 22 03:28:56 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 1qYGCW-0009S9-4Q for ged-emacs-devel@m.gmane-mx.org; Tue, 22 Aug 2023 03:28:56 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYGBm-0007Iv-QQ; Mon, 21 Aug 2023 21:28:10 -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 1qYGBl-0007Im-PB for emacs-devel@gnu.org; Mon, 21 Aug 2023 21:28:09 -0400 Original-Received: from mail-oa1-x2b.google.com ([2001:4860:4864:20::2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYGBh-0004RP-30 for emacs-devel@gnu.org; Mon, 21 Aug 2023 21:28:06 -0400 Original-Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1c11d53221cso2575189fac.2 for ; Mon, 21 Aug 2023 18:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692667684; x=1693272484; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=FJD3SC4S+9QAI7LO5uDMfjs4jk4VFKK0TVrYGZCD3X8=; b=KqeiAGX4ovnL2XCf5fJg+3TGQJu3WxjGXK5yxnplEG2b9/UUADM/61KbT+M9qqLGwQ P79fZD/IEHKqPu++qB8RYNzfhExQImzIxSHF3YDyX1fdm1Nd2JZrPgfKqmR/op02PXQB NUSEpP2LY1iuxxvMEB3y7cxm821o8a1tT94GT4XLSF3LPYqwb9Lg9+qQAjbYiIJNktrN 889rOHKWU7RaV58zPDOKH6S4LrJbL0/4+jDt7UbluTsJIHU9HsrFFO1PY1EskbRQupjf WKEXghm5fOQSceRblwhyTRdvb2AbdpKr8MmYd5cz+NCXJMJrjcX4wsyrLSwIHXOHIOzq O4qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692667684; x=1693272484; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FJD3SC4S+9QAI7LO5uDMfjs4jk4VFKK0TVrYGZCD3X8=; b=Us/brreB2ROW0rdE+JKjVohFpInwwDyBM2efvqVWakUZfZuKhphRwauLerG8pKkYsm qoTiYvhElvFdg1UGGeCTe4bI1fMmcr63LW6dzAtvoNX7+L0g4ss7JbArZdLUNojdnTU4 +eqOtT/VeZ1QUe1Hh3a5FXfSM8+w3L2e1mb1qDSOyYR6RsnsTSYARtRl/yT/1Wq2/tGT YDnRS7s2xrtHIzYYAuOyGcLxr9o+z1/JqEDUmeD+tuVv7JeABPoHGe1fSL4Kh9Zql3MD MR0KX4yHtFgFkTy0Alsj3wx1jotWL5u9uMggJA6K8JOlZdpSYHiZdHVEoq6bWY7R4+nV 2ktw== X-Gm-Message-State: AOJu0YzIoo5kgHpphIGF6MgLWNk1q3fP70A3vgyl93n0pkuJGbWkSWqO 55u39nV0j3UMwBbvt8An3w/Ih+wRKno= X-Google-Smtp-Source: AGHT+IH6j5460kHrtiDoQQSUjLg59sJWuImfuwnSd6f01EDq8nPr4wa6lt7ATzlkmR4gJ0fklmkRoQ== X-Received: by 2002:a05:6870:5ba3:b0:1bf:7e94:bba9 with SMTP id em35-20020a0568705ba300b001bf7e94bba9mr10327084oab.52.1692667683863; Mon, 21 Aug 2023 18:28:03 -0700 (PDT) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id b3-20020a17090acc0300b00263dfe9b972sm8620372pju.0.2023.08.21.18.28.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Aug 2023 18:28:03 -0700 (PDT) Content-Language: en-US In-Reply-To: <87sf8banxm.fsf@yahoo.com> Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=jporterbugs@gmail.com; helo=mail-oa1-x2b.google.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, 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:309098 Archived-At: Ok, I've made a couple of changes to fix the merge (see commit 0df2efa4d69), and then I ran gitmerge successfully and pushed the result. Additional details below. On 8/21/2023 6:03 PM, Po Lu wrote: > Jim Porter writes: > >> 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. 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. I've set Git to ignore the whitespace in the former file. Looking more closely at the latter, I think the extra newline really is unnecessary, so I removed it. However, if I've made a mistake, just let me know. > I will fix emacs_background.xml. Thanks.