This is an automated email from the ASF dual-hosted git repository. reshke pushed a commit to branch cbdb-postgres-merge in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 0eca9306c309c9ce06ab49f668abd76f6588c085 Author: reshke <[email protected]> AuthorDate: Tue Dec 23 17:57:28 2025 +0000 Fix pg_basebackup.c rebase markes --- src/bin/pg_basebackup/pg_basebackup.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 96fa3aec6bf..1ce53913762 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -176,7 +176,6 @@ static bool found_existing_xlogdir = false; static bool made_tablespace_dirs = false; static bool found_tablespace_dirs = false; -<<<<<<< HEAD static bool forceoverwrite = false; #define MAX_EXCLUDE 255 static int num_exclude = 0; @@ -185,10 +184,7 @@ static int num_exclude_from = 0; static char *excludefroms[MAX_EXCLUDE]; static int target_gp_dbid = 0; -/* Progress counters */ -======= /* Progress indicators */ ->>>>>>> REL_16_9 static uint64 totalsize_kb; static uint64 totaldone; static int tablespacecount; @@ -796,16 +792,10 @@ verify_dir_is_empty_or_create(char *dirname, bool *created, bool *found) * things that should not be deleted such as pg_log files if we * are doing segment recovery. */ -<<<<<<< HEAD if (forceoverwrite) return; - pg_log_error("directory \"%s\" exists but is not empty", dirname); - exit(1); - break; -======= pg_fatal("directory \"%s\" exists but is not empty", dirname); ->>>>>>> REL_16_9 case -1: /* --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
