This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new faffcd3c6fa Fix conflicts on src/tools
faffcd3c6fa is described below
commit faffcd3c6fab1dc935e735ca6ceeaa9e32a3faa3
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Mar 8 19:22:54 2026 -0400
Fix conflicts on src/tools
---
src/tools/make_etags | 7 --
src/tools/msvc/Mkvcbuild.pm | 19 ---
src/tools/msvc/README | 11 --
src/tools/msvc/Solution.pm | 254 ---------------------------------------
src/tools/msvc/vcregress.pl | 65 ----------
src/tools/pgindent/typedefs.list | 40 ------
6 files changed, 396 deletions(-)
diff --git a/src/tools/make_etags b/src/tools/make_etags
index 72c6f343574..7e51bb4c4e2 100755
--- a/src/tools/make_etags
+++ b/src/tools/make_etags
@@ -7,13 +7,6 @@ then echo "Usage: $0 [-n]"
exit 1
fi
-<<<<<<< HEAD
-rm -f ./TAGS
-
-find `pwd`/ -type f -name '*.[chyl]' -not -name "*_mock.c" -print |
- xargs etags --append -o TAGS
-=======
cdir=`dirname $0`
dir=`(cd $cdir && pwd)`
exec $dir/make_ctags -e $*
->>>>>>> REL_16_9
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 89103209809..7415234258f 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -43,17 +43,6 @@ my $contrib_extralibs = { 'libpq_pipeline' => ['ws2_32.lib']
};
my $contrib_extraincludes = {};
my $contrib_extrasource = {};
my @contrib_excludes = (
-<<<<<<< HEAD
- 'bool_plperl', 'commit_ts',
- 'hstore_plperl', 'hstore_plpython',
- 'intagg', 'jsonb_plperl',
- 'jsonb_plpython', 'ltree_plpython',
- 'pgcrypto', 'sepgsql',
- 'brin', 'test_extensions',
- 'test_misc', 'test_pg_dump',
- 'snapshot_too_old', 'unsafe_tests',
- 'test_escape');
-=======
'bool_plperl', 'commit_ts',
'hstore_plperl', 'hstore_plpython',
'intagg', 'jsonb_plperl',
@@ -62,7 +51,6 @@ my @contrib_excludes = (
'test_extensions', 'test_misc',
'test_pg_dump', 'snapshot_too_old',
'unsafe_tests', 'test_escape');
->>>>>>> REL_16_9
# Set of variables for frontend modules
my $frontend_defines = { 'pgbench' => 'FD_SETSIZE=1024' };
@@ -154,17 +142,10 @@ sub mkvcbuild
archive.c base64.c checksum_helper.c compression.c
config_info.c controldata_utils.c d2s.c encnames.c exec.c
f2s.c file_perm.c file_utils.c hashfn.c ip.c jsonapi.c
-<<<<<<< HEAD
- keywords.c kmgr_utils.c kwlookup.c link-canary.c md5_common.c
- pg_get_line.c pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c
- saslprep.c scram-common.c string.c stringinfo.c unicode_norm.c
username.c
- wait_error.c wchar.c);
-=======
keywords.c kwlookup.c link-canary.c md5_common.c percentrepl.c
pg_get_line.c pg_lzcompress.c pg_prng.c pgfnames.c psprintf.c
relpath.c
rmtree.c saslprep.c scram-common.c string.c stringinfo.c
unicode_norm.c
username.c wait_error.c wchar.c);
->>>>>>> REL_16_9
if ($solution->{options}->{openssl})
{
diff --git a/src/tools/msvc/README b/src/tools/msvc/README
index a3e080860de..1c36925258e 100644
--- a/src/tools/msvc/README
+++ b/src/tools/msvc/README
@@ -4,11 +4,7 @@ MSVC build
==========
This directory contains the tools required to build PostgreSQL using
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< HEAD
-Microsoft Visual Studio 2013 - 2022. This builds the whole backend, not just
-================================
Microsoft Visual Studio 2015 - 2022. This builds the whole backend, not just
->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> REL_16_9
the libpq frontend library. For more information, see the documentation
chapter "Installation on Windows" and the description below.
@@ -92,17 +88,10 @@ config_default.pl to create the configuration arguments.
These configuration arguments are passed over to Mkvcbuild::mkvcbuild
(Mkvcbuild.pm) which creates the Visual Studio project and solution files.
It does this by using VSObjectFactory::CreateSolution to create an object
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< HEAD
-implementing the Solution interface (this could be either VS2013Solution,
-VS2015Solution, VS2017Solution, VS2019Solution or VS2022Solution, all in
-Solution.pm, depending on the user's build environment) and adding objects
-implementing the corresponding Project interface (VC2013Project,
-================================
implementing the Solution interface (this could be either
VS2015Solution, VS2017Solution, VS2019Solution or VS2022Solution, all in
Solution.pm, depending on the user's build environment) and adding objects
implementing the corresponding Project interface (
->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> REL_16_9
VC2015Project, VC2017Project, VC2019Project or VC2022Project from
MSBuildProject.pm) to it. When Solution::Save is called, the implementations
of Solution and Project save their content in the appropriate format.
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index d36aceb4303..25c394c5d0b 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -222,248 +222,6 @@ sub GenerateFiles
ENABLE_THREAD_SAFETY => 1,
HAVE_APPEND_HISTORY => undef,
HAVE_ASN1_STRING_GET0_DATA => undef,
-<<<<<<< HEAD
- HAVE_ATOMICS => 1,
- HAVE_ATOMIC_H => undef,
- HAVE_BACKTRACE_SYMBOLS => undef,
- HAVE_BIO_METH_NEW => undef,
- HAVE_CLOCK_GETTIME => undef,
- HAVE_COMPUTED_GOTO => undef,
- HAVE_COPYFILE => undef,
- HAVE_COPYFILE_H => undef,
- HAVE_CRTDEFS_H => undef,
- HAVE_CRYPTO_LOCK => undef,
- HAVE_DECL_FDATASYNC => 0,
- HAVE_DECL_F_FULLFSYNC => 0,
- HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER => 0,
- HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER => 0,
- HAVE_DECL_LLVMGETHOSTCPUNAME => 0,
- HAVE_DECL_LLVMGETHOSTCPUFEATURES => 0,
- HAVE_DECL_LLVMORCGETSYMBOLADDRESSIN => 0,
- HAVE_DECL_POSIX_FADVISE => 0,
- HAVE_DECL_PREADV => 0,
- HAVE_DECL_PWRITEV => 0,
- HAVE_DECL_RTLD_GLOBAL => 0,
- HAVE_DECL_RTLD_NOW => 0,
- HAVE_DECL_STRLCAT => 0,
- HAVE_DECL_STRLCPY => 0,
- HAVE_DECL_STRNLEN => 1,
- HAVE_DECL_STRTOLL => 1,
- HAVE_DECL_STRTOULL => 1,
- HAVE_DLOPEN => undef,
- HAVE_EDITLINE_HISTORY_H => undef,
- HAVE_EDITLINE_READLINE_H => undef,
- HAVE_EXECINFO_H => undef,
- HAVE_EXPLICIT_BZERO => undef,
- HAVE_FDATASYNC => undef,
- HAVE_FLS => undef,
- HAVE_FSEEKO => 1,
- HAVE_FUNCNAME__FUNC => undef,
- HAVE_FUNCNAME__FUNCTION => 1,
- HAVE_GCC__ATOMIC_INT32_CAS => undef,
- HAVE_GCC__ATOMIC_INT64_CAS => undef,
- HAVE_GCC__SYNC_CHAR_TAS => undef,
- HAVE_GCC__SYNC_INT32_CAS => undef,
- HAVE_GCC__SYNC_INT32_TAS => undef,
- HAVE_GCC__SYNC_INT64_CAS => undef,
- HAVE_GETADDRINFO => undef,
- HAVE_GETHOSTBYNAME_R => undef,
- HAVE_GETIFADDRS => undef,
- HAVE_GETOPT => undef,
- HAVE_GETOPT_H => undef,
- HAVE_GETOPT_LONG => undef,
- HAVE_GETPEEREID => undef,
- HAVE_GETPEERUCRED => undef,
- HAVE_GETPWUID_R => undef,
- HAVE_GETRLIMIT => undef,
- HAVE_GETRUSAGE => undef,
- HAVE_GETTIMEOFDAY => undef,
- HAVE_GSSAPI_GSSAPI_H => undef,
- HAVE_GSSAPI_H => undef,
- HAVE_HMAC_CTX_FREE => undef,
- HAVE_HMAC_CTX_NEW => undef,
- HAVE_HISTORY_H => undef,
- HAVE_HISTORY_TRUNCATE_FILE => undef,
- HAVE_IFADDRS_H => undef,
- HAVE_INET_ATON => undef,
- HAVE_INT_TIMEZONE => 1,
- HAVE_INT64 => undef,
- HAVE_INT8 => undef,
- HAVE_INTTYPES_H => undef,
- HAVE_INT_OPTERR => undef,
- HAVE_INT_OPTRESET => undef,
- HAVE_IPV6 => 1,
- HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P => undef,
- HAVE_KQUEUE => undef,
- HAVE_LANGINFO_H => undef,
- HAVE_LDAP_H => undef,
- HAVE_LDAP_INITIALIZE => undef,
- HAVE_LIBCRYPTO => undef,
- HAVE_LIBLDAP => undef,
- HAVE_LIBLZ4 => undef,
- HAVE_LIBM => undef,
- HAVE_LIBPAM => undef,
- HAVE_LIBREADLINE => undef,
- HAVE_LIBSELINUX => undef,
- HAVE_LIBSSL => undef,
- HAVE_LIBWLDAP32 => undef,
- HAVE_LIBXML2 => undef,
- HAVE_LIBXSLT => undef,
- HAVE_LIBZ => $self->{options}->{zlib} ? 1 :
undef,
- HAVE_LINK => undef,
- HAVE_LOCALE_T => 1,
- HAVE_LONG_INT_64 => undef,
- HAVE_LONG_LONG_INT_64 => 1,
- HAVE_LZ4_H => undef,
- HAVE_MBARRIER_H => undef,
- HAVE_MBSTOWCS_L => 1,
- HAVE_MEMORY_H => 1,
- HAVE_MEMSET_S => undef,
- HAVE_MINIDUMP_TYPE => 1,
- HAVE_MKDTEMP => undef,
- HAVE_NETINET_TCP_H => undef,
- HAVE_NET_IF_H => undef,
- HAVE_OPENSSL_INIT_SSL => undef,
- HAVE_OSSP_UUID_H => undef,
- HAVE_PAM_PAM_APPL_H => undef,
- HAVE_POLL => undef,
- HAVE_POLL_H => undef,
- HAVE_POSIX_FADVISE => undef,
- HAVE_POSIX_FALLOCATE => undef,
- HAVE_PPC_LWARX_MUTEX_HINT => undef,
- HAVE_PPOLL => undef,
- HAVE_PREAD => undef,
- HAVE_PSTAT => undef,
- HAVE_PS_STRINGS => undef,
- HAVE_PTHREAD => undef,
- HAVE_PTHREAD_BARRIER_WAIT => undef,
- HAVE_PTHREAD_IS_THREADED_NP => undef,
- HAVE_PTHREAD_PRIO_INHERIT => undef,
- HAVE_PWRITE => undef,
- HAVE_RANDOM => undef,
- HAVE_READLINE_H => undef,
- HAVE_READLINE_HISTORY_H => undef,
- HAVE_READLINE_READLINE_H => undef,
- HAVE_READLINK => undef,
- HAVE_READV => undef,
- HAVE_RL_COMPLETION_APPEND_CHARACTER => undef,
- HAVE_RL_COMPLETION_MATCHES => undef,
- HAVE_RL_COMPLETION_SUPPRESS_QUOTE => undef,
- HAVE_RL_FILENAME_COMPLETION_FUNCTION => undef,
- HAVE_RL_FILENAME_QUOTE_CHARACTERS => undef,
- HAVE_RL_FILENAME_QUOTING_FUNCTION => undef,
- HAVE_RL_RESET_SCREEN_SIZE => undef,
- HAVE_SECURITY_PAM_APPL_H => undef,
- HAVE_SETENV => undef,
- HAVE_SETPROCTITLE => undef,
- HAVE_SETPROCTITLE_FAST => undef,
- HAVE_SETSID => undef,
- HAVE_SHM_OPEN => undef,
- HAVE_SPINLOCKS => 1,
- HAVE_SRANDOM => undef,
- HAVE_STDBOOL_H => 1,
- HAVE_STDINT_H => 1,
- HAVE_STDLIB_H => 1,
- HAVE_STRCHRNUL => undef,
- HAVE_STRERROR_R => undef,
- HAVE_STRINGS_H => undef,
- HAVE_STRING_H => 1,
- HAVE_STRLCAT => undef,
- HAVE_STRLCPY => undef,
- HAVE_STRNLEN => 1,
- HAVE_STRSIGNAL => undef,
- HAVE_STRTOF => 1,
- HAVE_STRTOLL => 1,
- HAVE_STRTOQ => undef,
- HAVE_STRTOULL => 1,
- HAVE_STRTOUQ => undef,
- HAVE_STRUCT_ADDRINFO => 1,
- HAVE_STRUCT_CMSGCRED => undef,
- HAVE_STRUCT_OPTION => undef,
- HAVE_STRUCT_SOCKADDR_SA_LEN => undef,
- HAVE_STRUCT_SOCKADDR_STORAGE => 1,
- HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY => 1,
- HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN => undef,
- HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY => undef,
- HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN => undef,
- HAVE_STRUCT_SOCKADDR_UN => undef,
- HAVE_STRUCT_TM_TM_ZONE => undef,
- HAVE_SYNC_FILE_RANGE => undef,
- HAVE_SYMLINK => 1,
- HAVE_SYNCFS => undef,
- HAVE_SYSLOG => undef,
- HAVE_SYS_EPOLL_H => undef,
- HAVE_SYS_EVENT_H => undef,
- HAVE_SYS_IPC_H => undef,
- HAVE_SYS_PRCTL_H => undef,
- HAVE_SYS_PROCCTL_H => undef,
- HAVE_SYS_PSTAT_H => undef,
- HAVE_SYS_RESOURCE_H => undef,
- HAVE_SYS_SELECT_H => undef,
- HAVE_SYS_SEM_H => undef,
- HAVE_SYS_SHM_H => undef,
- HAVE_SYS_SIGNALFD_H => undef,
- HAVE_SYS_SOCKIO_H => undef,
- HAVE_SYS_STAT_H => 1,
- HAVE_SYS_TAS_H => undef,
- HAVE_SYS_TYPES_H => 1,
- HAVE_SYS_UCRED_H => undef,
- HAVE_SYS_UIO_H => undef,
- HAVE_SYS_UN_H => undef,
- HAVE_TERMIOS_H => undef,
- HAVE_TYPEOF => undef,
- HAVE_UCRED_H => undef,
- HAVE_UINT64 => undef,
- HAVE_UINT8 => undef,
- HAVE_UNION_SEMUN => undef,
- HAVE_UNISTD_H => 1,
- HAVE_UNSETENV => undef,
- HAVE_USELOCALE => undef,
- HAVE_UUID_BSD => undef,
- HAVE_UUID_E2FS => undef,
- HAVE_UUID_OSSP => undef,
- HAVE_UUID_H => undef,
- HAVE_UUID_UUID_H => undef,
- HAVE_WINLDAP_H => undef,
- HAVE_WCSTOMBS_L => 1,
- HAVE_WCTYPE_H => 1,
- HAVE_WRITEV => undef,
- HAVE_X509_GET_SIGNATURE_NID => 1,
- HAVE_X86_64_POPCNTQ => undef,
- HAVE__BOOL => undef,
- HAVE__BUILTIN_BSWAP16 => undef,
- HAVE__BUILTIN_BSWAP32 => undef,
- HAVE__BUILTIN_BSWAP64 => undef,
- HAVE__BUILTIN_CLZ => undef,
- HAVE__BUILTIN_CONSTANT_P => undef,
- HAVE__BUILTIN_CTZ => undef,
- HAVE__BUILTIN_FRAME_ADDRESS => undef,
- HAVE__BUILTIN_OP_OVERFLOW => undef,
- HAVE__BUILTIN_POPCOUNT => undef,
- HAVE__BUILTIN_TYPES_COMPATIBLE_P => undef,
- HAVE__BUILTIN_UNREACHABLE => undef,
- HAVE__CONFIGTHREADLOCALE => 1,
- HAVE__CPUID => 1,
- HAVE__GET_CPUID => undef,
- HAVE__STATIC_ASSERT => undef,
- HAVE___STRTOLL => undef,
- HAVE___STRTOULL => undef,
- INT64_MODIFIER => qq{"ll"},
- LOCALE_T_IN_XLOCALE => undef,
- MAXIMUM_ALIGNOF => 8,
- MEMSET_LOOP_LIMIT => 1024,
- OPENSSL_API_COMPAT => $openssl_api_compat,
- PACKAGE_BUGREPORT =>
qq{"$package_bugreport"},
- PACKAGE_NAME => qq{"$package_name"},
- PACKAGE_STRING => qq{"$package_name $package_version"},
- PACKAGE_TARNAME => lc qq{"$package_name"},
- PACKAGE_URL => qq{"$package_url"},
- PACKAGE_VERSION => qq{"$package_version"},
- PG_INT128_TYPE => undef,
- PG_INT64_TYPE => 'long long int',
- PG_KRB_SRVNAM => qq{"postgres"},
- PG_MAJORVERSION => qq{"$majorver"},
-=======
HAVE_ATOMICS => 1,
HAVE_ATOMIC_H => undef,
HAVE_BACKTRACE_SYMBOLS => undef,
@@ -645,7 +403,6 @@ sub GenerateFiles
PG_INT64_TYPE => 'long long int',
PG_KRB_SRVNAM => qq{"postgres"},
PG_MAJORVERSION => qq{"$majorver"},
->>>>>>> REL_16_9
PG_MAJORVERSION_NUM => $majorver,
PG_MINORVERSION_NUM => $minorver,
PG_PRINTF_ATTRIBUTE => undef,
@@ -732,9 +489,6 @@ sub GenerateFiles
my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion();
-<<<<<<< HEAD
- # More symbols are needed with OpenSSL 1.1.0 and above.
-=======
# Symbols needed with OpenSSL 1.1.1 and above.
if ( ($digit1 >= '3' && $digit2 >= '0' && $digit3 >= '0')
|| ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '1'))
@@ -744,17 +498,10 @@ sub GenerateFiles
}
# Symbols needed with OpenSSL 1.1.0 and above.
->>>>>>> REL_16_9
if ( ($digit1 >= '3' && $digit2 >= '0' && $digit3 >= '0')
|| ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0'))
{
$define{HAVE_ASN1_STRING_GET0_DATA} = 1;
-<<<<<<< HEAD
- $define{HAVE_BIO_METH_NEW} = 1;
- $define{HAVE_HMAC_CTX_FREE} = 1;
- $define{HAVE_HMAC_CTX_NEW} = 1;
- $define{HAVE_OPENSSL_INIT_SSL} = 1;
-=======
$define{HAVE_BIO_METH_NEW} = 1;
$define{HAVE_HMAC_CTX_FREE} = 1;
$define{HAVE_HMAC_CTX_NEW} = 1;
@@ -767,7 +514,6 @@ sub GenerateFiles
|| ($digit1 >= '1' && $digit2 >= '0' && $digit3 >= '2'))
{
$define{HAVE_SSL_CTX_SET_CERT_CB} = 1;
->>>>>>> REL_16_9
}
}
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index b2ae9a61e8b..79c7a5c8914 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -124,11 +124,7 @@ exit 0;
# Helper function for set_command_env, to set one environment command.
sub set_single_env
{
-<<<<<<< HEAD
- my $envname = shift;
-=======
my $envname = shift;
->>>>>>> REL_16_9
my $envdefault = shift;
# If a command is defined by the environment, just use it.
@@ -149,13 +145,9 @@ sub set_single_env
sub set_command_env
{
set_single_env('GZIP_PROGRAM', 'gzip');
-<<<<<<< HEAD
- set_single_env('LZ4', 'lz4');
-=======
set_single_env('LZ4', 'lz4');
set_single_env('OPENSSL', 'openssl');
set_single_env('ZSTD', 'zstd');
->>>>>>> REL_16_9
}
sub installcheck_internal
@@ -299,13 +291,9 @@ sub tap_check
$ENV{PG_REGRESS} = "$topdir/$Config/pg_regress/pg_regress";
$ENV{REGRESS_SHLIB} = "$topdir/src/test/regress/regress.dll";
-<<<<<<< HEAD
- $ENV{TESTDIR} = "$dir";
-=======
$ENV{TESTDATADIR} = "$dir/tmp_check";
$ENV{TESTLOGDIR} = "$dir/tmp_check/log";
->>>>>>> REL_16_9
my $module = basename $dir;
# add the module build dir as the second element in the PATH
$ENV{PATH} =~ s!;!;$topdir/$Config/$module;!;
@@ -332,7 +320,6 @@ sub bincheck
foreach my $dir (@bin_dirs)
{
next unless -d "$dir/t";
-
my $status = tap_check($dir);
$mstat ||= $status;
}
@@ -364,58 +351,6 @@ sub taptest
return;
}
-<<<<<<< HEAD
-sub mangle_plpython3
-{
- my $tests = shift;
- mkdir "results" unless -d "results";
- mkdir "sql/python3";
- mkdir "results/python3";
- mkdir "expected/python3";
-
- foreach my $test (@$tests)
- {
- local $/ = undef;
- foreach my $dir ('sql', 'expected')
- {
- my $extension = ($dir eq 'sql' ? 'sql' : 'out');
-
- my @files =
- glob("$dir/$test.$extension
$dir/${test}_[0-9].$extension");
- foreach my $file (@files)
- {
- open(my $handle, '<', $file)
- || die "test file $file not found";
- my $contents = <$handle>;
- close($handle);
- do
- {
- s/<type
'exceptions\.([[:alpha:]]*)'>/<class '$1'>/g;
- s/<type 'long'>/<class 'int'>/g;
- s/([0-9][0-9]*)L/$1/g;
- s/([ [{])u"/$1"/g;
- s/([ [{])u'/$1'/g;
- s/def next/def __next__/g;
- s/LANGUAGE plpython2?u/LANGUAGE
plpython3u/g;
- s/EXTENSION (\S*?)plpython2?u/EXTENSION
$1plpython3u/g;
- s/installing required extension
"plpython2u"/installing required extension "plpython3u"/g;
- }
- for ($contents);
- my $base = basename $file;
- open($handle, '>', "$dir/python3/$base")
- || die "opening python 3 file for $file";
- print $handle $contents;
- close($handle);
- }
- }
- }
- do { s!^!python3/!; }
- foreach (@$tests);
- return @$tests;
-}
-
-=======
->>>>>>> REL_16_9
sub plcheck
{
chdir "$topdir/src/pl";
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 0752fbae927..97ae28337d3 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -492,12 +492,9 @@ CoverPos
CreateAmStmt
CreateCastStmt
CreateConversionStmt
-<<<<<<< HEAD
CreateDirectoryTableStmt
-=======
CreateDBRelInfo
CreateDBStrategy
->>>>>>> REL_16_9
CreateDomainStmt
CreateEnumStmt
CreateEventTrigStmt
@@ -1552,10 +1549,7 @@ MemoizeKey
MemoizePath
MemoizeState
MemoizeTuple
-<<<<<<< HEAD
-=======
MemoryChunk
->>>>>>> REL_16_9
MemoryContext
MemoryContextCallback
MemoryContextCallbackFunction
@@ -2077,39 +2071,6 @@ PgStat_EntryRefHashEntry
PgStat_FetchConsistency
PgStat_FunctionCallUsage
PgStat_FunctionCounts
-<<<<<<< HEAD
-PgStat_FunctionEntry
-PgStat_GlobalStats
-PgStat_Msg
-PgStat_MsgAnalyze
-PgStat_MsgAnlAncestors
-PgStat_MsgArchiver
-PgStat_MsgAutovacStart
-PgStat_MsgBgWriter
-PgStat_MsgChecksumFailure
-PgStat_MsgConnect
-PgStat_MsgDeadlock
-PgStat_MsgDisconnect
-PgStat_MsgDropdb
-PgStat_MsgDummy
-PgStat_MsgFuncpurge
-PgStat_MsgFuncstat
-PgStat_MsgHdr
-PgStat_MsgInquiry
-PgStat_MsgRecoveryConflict
-PgStat_MsgReplSlot
-PgStat_MsgResetcounter
-PgStat_MsgResetreplslotcounter
-PgStat_MsgResetsharedcounter
-PgStat_MsgResetsinglecounter
-PgStat_MsgResetslrucounter
-PgStat_MsgSLRU
-PgStat_MsgTabpurge
-PgStat_MsgTabstat
-PgStat_MsgTempFile
-PgStat_MsgVacuum
-PgStat_MsgWal
-=======
PgStat_HashKey
PgStat_IO
PgStat_Kind
@@ -2118,7 +2079,6 @@ PgStat_LocalState
PgStat_PendingDroppedStatsItem
PgStat_PendingIO
PgStat_PendingWalStats
->>>>>>> REL_16_9
PgStat_SLRUStats
PgStat_ShmemControl
PgStat_Snapshot
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
