From: Tom Lane <tgl@sss.pgh.pa.us>
To: Nikita Malakhov <hukutoc@gmail.com>
cc: Alvaro Herrera <alvherre@alvh.no-ip.org>,
        Andres Freund <andres@anarazel.de>,
 Jelte Fennema <postgres@jeltef.nl>,
        Peter Geoghegan <pg@bowt.ie>, Bruce Momjian <bruce@momjian.us>,
        Magnus Hagander <magnus@hagander.net>,
        Stephen Frost <sfrost@snowman.net>, Noah Misch <noah@leadboat.com>,
        Jesse Zhang <sbjesse@gmail.com>,
        PostgreSQL-development <pgsql-hackers@postgresql.org>
Subject: Re: run pgindent on a regular basis / scripted manner
In-reply-to: 
 <CAN-LCVNctZtm=GGa7WSxyH85GQDof-h0ok4v1VcS+8j1LivApg@mail.gmail.com>
References: <20230123162225.5ynn7qgjdshpqiyn@alvherre.pgsql>
 <20230123173820.5taw5j5axceifsdz@alvherre.pgsql>
 <CAN-LCVNctZtm=GGa7WSxyH85GQDof-h0ok4v1VcS+8j1LivApg@mail.gmail.com>
Comments: In-reply-to Nikita Malakhov <hukutoc@gmail.com>
	message dated "Mon, 23 Jan 2023 21:54:15 +0300"
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <1921829.1674504550.1@sss.pgh.pa.us>
Date: Mon, 23 Jan 2023 15:09:10 -0500
Message-ID: <1921830.1674504550@sss.pgh.pa.us>
Archived-At: 
 <https://www.postgresql.org/message-id/1921830.1674504550%40sss.pgh.pa.us>
Precedence: bulk

Nikita Malakhov <hukutoc@gmail.com> writes:
> I've ran pdindent on the whole Postgres and it'd changed
> an awful lot of source files. Won't it create a lot of merge conflicts?

Well, yeah, you've rediscovered the fact that a lot of commits are sloppy
about this, and it's been awhile since our last tree-wide pgindent.

Our normal process has been to do a cleanup pgindent run annually or so,
usually after the end of the last commitfest of a cycle when there's
plenty of time for people to deal with the ensuing merge conflicts.

If we could get to "commits are pgindent clean to begin with", we
could avoid the merge problems from one-big-reindent.  I'd still
be inclined to do an annual run as a backup, but hopefully it would
find few problems.

			regards, tom lane