From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <schwab@suse.de>
Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d])
 by sourceware.org (Postfix) with ESMTPS id 195F13858D39
 for <libc-alpha@sourceware.org>; Mon,  1 Aug 2022 14:08:22 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 195F13858D39
Received: from relay2.suse.de (relay2.suse.de [149.44.160.134])
 by smtp-out2.suse.de (Postfix) with ESMTP id 57F2920962;
 Mon,  1 Aug 2022 14:08:21 +0000 (UTC)
Received: from hawking.suse.de (unknown [10.168.4.11])
 by relay2.suse.de (Postfix) with ESMTP id 4FEEC2C141;
 Mon,  1 Aug 2022 14:08:21 +0000 (UTC)
Received: by hawking.suse.de (Postfix, from userid 17005)
 id E7ABD444B21; Mon,  1 Aug 2022 16:08:20 +0200 (CEST)
From: Andreas Schwab <schwab@suse.de>
To: Wilco Dijkstra via Libc-alpha <libc-alpha@sourceware.org>
Cc: Carlos O'Donell <carlos@redhat.com>,  Wilco Dijkstra
 <Wilco.Dijkstra@arm.com>
Subject: Re: [PATCH] Remove atomic_forced_read
References: <AM5PR0801MB16688EAC29BF06DEC4FCD9CC838E9@AM5PR0801MB1668.eurprd08.prod.outlook.com>
 <dc5064d2-8747-5a60-c4d6-87ae914742a1@redhat.com>
 <AM5PR0801MB1668BE8C9C23054A0A19A073839A9@AM5PR0801MB1668.eurprd08.prod.outlook.com>
X-Yow: YOW!!  Now I understand advanced MICROBIOLOGY
 and th' new TAX REFORM laws!!
Date: Mon, 01 Aug 2022 16:08:20 +0200
In-Reply-To: <AM5PR0801MB1668BE8C9C23054A0A19A073839A9@AM5PR0801MB1668.eurprd08.prod.outlook.com>
 (Wilco Dijkstra via Libc-alpha's message of "Mon, 1 Aug 2022 14:02:48
 +0000")
Message-ID: <mvm7d3shx9n.fsf@suse.de>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.90 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00, DKIM_SIGNED,
 DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, SPF_HELO_NONE, SPF_PASS,
 TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
 server2.sourceware.org
X-BeenThere: libc-alpha@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Aug 2022 14:08:23 -0000

On Aug 01 2022, Wilco Dijkstra via Libc-alpha wrote:

> So it sounds like the merge tool is getting confused (which is stupid because no
> context is needed when you remove lines, all you need is matching the actual
> lines removed, and that's trivial since they didn't change).

That's not true if the same lines occur several times in a file, in
different contexts.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."