=== Applying patches on top of PostgreSQL commit ID 12efa48978c6dba5eca1b95758127181783fb217 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Aug 3 07:23:20 UTC 2025 On branch cf/5826 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-pg_restore-freeze.patch === Applying: pg_restore --freeze Using index info to reconstruct a base tree... M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_restore.c Falling back to patching base and 3-way merge... Auto-merging src/bin/pg_dump/pg_restore.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_restore.c Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/pg_backup_archiver.c Auto-merging src/bin/pg_dump/pg_backup.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 pg_restore --freeze When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_restore.c === using patch(1) to apply patch ./0001-pg_restore-freeze.patch === patching file src/bin/pg_dump/pg_backup.h patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #2 succeeded at 1019 (offset -5 lines). Hunk #3 succeeded at 1082 (offset -5 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 2852 (offset -4 lines). patching file src/bin/pg_dump/pg_restore.c Hunk #1 succeeded at 83 with fuzz 2 (offset -31 lines). Hunk #2 FAILED at 176. Hunk #3 succeeded at 422 (offset -46 lines). Hunk #4 FAILED at 717. 2 out of 4 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_restore.c.rej Unstaged changes after reset: M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_restore.c Removing src/bin/pg_dump/pg_restore.c.rej === using 'git apply' to apply patch ./0001-pg_restore-freeze.patch === Applied patch to 'src/bin/pg_dump/pg_backup.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_restore.c' with conflicts. U src/bin/pg_dump/pg_restore.c diff --cc src/bin/pg_dump/pg_restore.c index 6c129278bc5,f9a659de16e..00000000000 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@@ -82,7 -111,10 +82,8 @@@ main(int argc, char **argv static int no_subscriptions = 0; static int strict_names = 0; static int statistics_only = 0; - static int with_data = 0; - static int with_schema = 0; static int with_statistics = 0; + static int freeze = 0; struct option cmdopts[] = { {"clean", 0, NULL, 'c'}, @@@ -137,9 -170,13 +138,14 @@@ {"no-security-labels", no_argument, &no_security_labels, 1}, {"no-subscriptions", no_argument, &no_subscriptions, 1}, {"no-statistics", no_argument, &no_statistics, 1}, - {"with-data", no_argument, &with_data, 1}, - {"with-schema", no_argument, &with_schema, 1}, - {"with-statistics", no_argument, &with_statistics, 1}, + {"statistics", no_argument, &with_statistics, 1}, {"statistics-only", no_argument, &statistics_only, 1}, {"filter", required_argument, NULL, 4}, ++<<<<<<< ours ++======= + {"exclude-database", required_argument, NULL, 6}, + {"freeze", no_argument, &freeze, 1}, ++>>>>>>> theirs {NULL, 0, NULL, 0} }; @@@ -555,6 -715,10 +562,13 @@@ usage(const char *progname printf(_(" --use-set-session-authorization\n" " use SET SESSION AUTHORIZATION commands instead of\n" " ALTER OWNER commands to set ownership\n")); ++<<<<<<< ours ++======= + printf(_(" --with-data restore the data\n")); + printf(_(" --with-schema restore the schema\n")); + printf(_(" --with-statistics restore the statistics\n")); + printf(_(" --freeze COPY FREEZE (read the manual for caveats)\n")); ++>>>>>>> theirs printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));