From: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Andres Freund <andres@anarazel.de>
Cc: Michael Paquier <michael@paquier.xyz>
Cc: pgsql-hackers@lists.postgresql.org
Subject: Re: Splitting up guc.c
Date: Mon, 12 Sep 2022 21:12:03 +0100
Message-ID: <87v8psl5d8.fsf@wibble.ilmari.org> (raw)
In-Reply-To: <1771845.1663011970@sss.pgh.pa.us>
References: <587607.1662836699@sss.pgh.pa.us>
<Yx0vHEBXwcUggZYK@paquier.xyz>
<666417.1662862120@sss.pgh.pa.us>
<925946.1662918775@sss.pgh.pa.us>
<1305798.1662935501@sss.pgh.pa.us>
<20220912193928.wgrccx4b4k3solpu@awork3.anarazel.de>
<1771845.1663011970@sss.pgh.pa.us>
Tom Lane <tgl@sss.pgh.pa.us> writes:
>> I think this is localized enough that asking people to manually resolve a
>> conflict around adding a GUC entry wouldn't be asking for that much. And I
>> think plenty changes might be automatically resolvable, despite the rename.
>
> I wonder whether git will be able to figure out that this is mostly a
> code move. I would expect so for a straight file rename, but will that
> work when we're splitting the file 3 ways?
Git can detect more complicated code movement (see the `--color-moved`
option to `git diff`), but I'm not sure it's clever enough to realise
that a change modifying a block of code that was moved in the meanwhile
should be applied at the new destination.
> regards, tom lane
- ilmari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: ilmari@ilmari.org, tgl@sss.pgh.pa.us, andres@anarazel.de, michael@paquier.xyz, pgsql-hackers@lists.postgresql.org
Subject: Re: Splitting up guc.c
In-Reply-To: <87v8psl5d8.fsf@wibble.ilmari.org>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox