=== Applying patches on top of PostgreSQL commit ID 7a662a46ebf74e9fa15cb62b592b4bf00c96fc94 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Oct 13 09:21:19 UTC 2025 On branch cf/6122 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-PATCH-V1-Improve-TAP-test-uses-of-Test-More-funct.patch === Applying: Improve TAP test uses of Test::More functions Using index info to reconstruct a base tree... M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/pgbench/t/001_pgbench_with_server.pl M src/test/subscription/t/035_conflicts.pl Falling back to patching base and 3-way merge... Auto-merging src/test/subscription/t/035_conflicts.pl CONFLICT (content): Merge conflict in src/test/subscription/t/035_conflicts.pl Auto-merging src/bin/pgbench/t/001_pgbench_with_server.pl Auto-merging src/bin/pg_dump/t/002_pg_dump.pl error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Improve TAP test uses of Test::More functions 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 contrib/amcheck/t/004_verify_nbtree_unique.pl M contrib/pg_visibility/t/002_corrupt_vm.pl M src/bin/initdb/t/001_initdb.pl M src/bin/pg_basebackup/t/010_pg_basebackup.pl M src/bin/pg_basebackup/t/040_pg_createsubscriber.pl M src/bin/pg_combinebackup/t/010_hardlink.pl M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/pg_dump/t/005_pg_dump_filterfile.pl M src/bin/pgbench/t/001_pgbench_with_server.pl M src/bin/psql/t/001_basic.pl M src/bin/scripts/t/020_createdb.pl M src/interfaces/libpq/t/003_load_balance_host_list.pl M src/interfaces/libpq/t/004_load_balance_dns.pl M src/test/modules/test_aio/t/002_io_workers.pl M src/test/modules/test_json_parser/t/004_test_parser_perf.pl M src/test/modules/test_misc/t/001_constraint_validation.pl M src/test/modules/test_misc/t/002_tablespace.pl M src/test/modules/test_pg_dump/t/001_base.pl M src/test/modules/xid_wraparound/t/002_limits.pl M src/test/recovery/t/001_stream_rep.pl M src/test/recovery/t/003_recovery_targets.pl M src/test/recovery/t/005_replay_delay.pl M src/test/recovery/t/006_logical_decoding.pl M src/test/recovery/t/020_archive_status.pl M src/test/recovery/t/024_archive_recovery.pl M src/test/recovery/t/035_standby_logical_decoding.pl M src/test/recovery/t/040_standby_failover_slots_sync.pl M src/test/recovery/t/042_low_level_backup.pl M src/test/recovery/t/044_invalidate_inactive_slots.pl M src/test/ssl/t/001_ssltests.pl M src/test/subscription/t/001_rep_changes.pl M src/test/subscription/t/007_ddl.pl M src/test/subscription/t/013_partition.pl M src/test/subscription/t/027_nosuperuser.pl M src/test/subscription/t/031_column_list.pl M src/test/subscription/t/035_conflicts.pl === using patch(1) to apply patch ./v1-0001-PATCH-V1-Improve-TAP-test-uses-of-Test-More-funct.patch === patching file contrib/amcheck/t/004_verify_nbtree_unique.pl patching file contrib/pg_visibility/t/002_corrupt_vm.pl patching file src/bin/initdb/t/001_initdb.pl patching file src/bin/pg_basebackup/t/010_pg_basebackup.pl patching file src/bin/pg_basebackup/t/040_pg_createsubscriber.pl patching file src/bin/pg_combinebackup/t/010_hardlink.pl patching file src/bin/pg_dump/t/002_pg_dump.pl Hunk #1 succeeded at 5597 (offset 120 lines). patching file src/bin/pg_dump/t/005_pg_dump_filterfile.pl patching file src/bin/pgbench/t/001_pgbench_with_server.pl patching file src/bin/psql/t/001_basic.pl patching file src/bin/scripts/t/020_createdb.pl patching file src/interfaces/libpq/t/003_load_balance_host_list.pl patching file src/interfaces/libpq/t/004_load_balance_dns.pl patching file src/test/modules/test_aio/t/002_io_workers.pl patching file src/test/modules/test_json_parser/t/004_test_parser_perf.pl patching file src/test/modules/test_misc/t/001_constraint_validation.pl patching file src/test/modules/test_misc/t/002_tablespace.pl patching file src/test/modules/test_pg_dump/t/001_base.pl patching file src/test/modules/xid_wraparound/t/002_limits.pl patching file src/test/recovery/t/001_stream_rep.pl patching file src/test/recovery/t/003_recovery_targets.pl patching file src/test/recovery/t/005_replay_delay.pl patching file src/test/recovery/t/006_logical_decoding.pl patching file src/test/recovery/t/020_archive_status.pl patching file src/test/recovery/t/024_archive_recovery.pl patching file src/test/recovery/t/035_standby_logical_decoding.pl patching file src/test/recovery/t/040_standby_failover_slots_sync.pl patching file src/test/recovery/t/042_low_level_backup.pl patching file src/test/recovery/t/044_invalidate_inactive_slots.pl patching file src/test/ssl/t/001_ssltests.pl patching file src/test/subscription/t/001_rep_changes.pl patching file src/test/subscription/t/007_ddl.pl patching file src/test/subscription/t/013_partition.pl patching file src/test/subscription/t/027_nosuperuser.pl patching file src/test/subscription/t/031_column_list.pl patching file src/test/subscription/t/035_conflicts.pl Hunk #6 FAILED at 347. Hunk #7 succeeded at 371 (offset -9 lines). Hunk #8 succeeded at 502 (offset -9 lines). Hunk #9 succeeded at 527 (offset -9 lines). Hunk #10 FAILED at 559. 2 out of 10 hunks FAILED -- saving rejects to file src/test/subscription/t/035_conflicts.pl.rej Unstaged changes after reset: M contrib/amcheck/t/004_verify_nbtree_unique.pl M contrib/pg_visibility/t/002_corrupt_vm.pl M src/bin/initdb/t/001_initdb.pl M src/bin/pg_basebackup/t/010_pg_basebackup.pl M src/bin/pg_basebackup/t/040_pg_createsubscriber.pl M src/bin/pg_combinebackup/t/010_hardlink.pl M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/pg_dump/t/005_pg_dump_filterfile.pl M src/bin/pgbench/t/001_pgbench_with_server.pl M src/bin/psql/t/001_basic.pl M src/bin/scripts/t/020_createdb.pl M src/interfaces/libpq/t/003_load_balance_host_list.pl M src/interfaces/libpq/t/004_load_balance_dns.pl M src/test/modules/test_aio/t/002_io_workers.pl M src/test/modules/test_json_parser/t/004_test_parser_perf.pl M src/test/modules/test_misc/t/001_constraint_validation.pl M src/test/modules/test_misc/t/002_tablespace.pl M src/test/modules/test_pg_dump/t/001_base.pl M src/test/modules/xid_wraparound/t/002_limits.pl M src/test/recovery/t/001_stream_rep.pl M src/test/recovery/t/003_recovery_targets.pl M src/test/recovery/t/005_replay_delay.pl M src/test/recovery/t/006_logical_decoding.pl M src/test/recovery/t/020_archive_status.pl M src/test/recovery/t/024_archive_recovery.pl M src/test/recovery/t/035_standby_logical_decoding.pl M src/test/recovery/t/040_standby_failover_slots_sync.pl M src/test/recovery/t/042_low_level_backup.pl M src/test/recovery/t/044_invalidate_inactive_slots.pl M src/test/ssl/t/001_ssltests.pl M src/test/subscription/t/001_rep_changes.pl M src/test/subscription/t/007_ddl.pl M src/test/subscription/t/013_partition.pl M src/test/subscription/t/027_nosuperuser.pl M src/test/subscription/t/031_column_list.pl M src/test/subscription/t/035_conflicts.pl Removing src/test/subscription/t/035_conflicts.pl.rej === using 'git apply' to apply patch ./v1-0001-PATCH-V1-Improve-TAP-test-uses-of-Test-More-funct.patch === Applied patch to 'contrib/amcheck/t/004_verify_nbtree_unique.pl' cleanly. Applied patch to 'contrib/pg_visibility/t/002_corrupt_vm.pl' cleanly. Applied patch to 'src/bin/initdb/t/001_initdb.pl' cleanly. Applied patch to 'src/bin/pg_basebackup/t/010_pg_basebackup.pl' cleanly. Applied patch to 'src/bin/pg_basebackup/t/040_pg_createsubscriber.pl' cleanly. Applied patch to 'src/bin/pg_combinebackup/t/010_hardlink.pl' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/pg_dump/t/005_pg_dump_filterfile.pl' cleanly. Applied patch to 'src/bin/pgbench/t/001_pgbench_with_server.pl' cleanly. Applied patch to 'src/bin/psql/t/001_basic.pl' cleanly. Applied patch to 'src/bin/scripts/t/020_createdb.pl' cleanly. Applied patch to 'src/interfaces/libpq/t/003_load_balance_host_list.pl' cleanly. Applied patch to 'src/interfaces/libpq/t/004_load_balance_dns.pl' cleanly. Applied patch to 'src/test/modules/test_aio/t/002_io_workers.pl' cleanly. Applied patch to 'src/test/modules/test_json_parser/t/004_test_parser_perf.pl' cleanly. Applied patch to 'src/test/modules/test_misc/t/001_constraint_validation.pl' cleanly. Applied patch to 'src/test/modules/test_misc/t/002_tablespace.pl' cleanly. Applied patch to 'src/test/modules/test_pg_dump/t/001_base.pl' cleanly. Applied patch to 'src/test/modules/xid_wraparound/t/002_limits.pl' cleanly. Applied patch to 'src/test/recovery/t/001_stream_rep.pl' cleanly. Applied patch to 'src/test/recovery/t/003_recovery_targets.pl' cleanly. Applied patch to 'src/test/recovery/t/005_replay_delay.pl' cleanly. Applied patch to 'src/test/recovery/t/006_logical_decoding.pl' cleanly. Applied patch to 'src/test/recovery/t/020_archive_status.pl' cleanly. Applied patch to 'src/test/recovery/t/024_archive_recovery.pl' cleanly. Applied patch to 'src/test/recovery/t/035_standby_logical_decoding.pl' cleanly. Applied patch to 'src/test/recovery/t/040_standby_failover_slots_sync.pl' cleanly. Applied patch to 'src/test/recovery/t/042_low_level_backup.pl' cleanly. Applied patch to 'src/test/recovery/t/044_invalidate_inactive_slots.pl' cleanly. Applied patch to 'src/test/ssl/t/001_ssltests.pl' cleanly. Applied patch to 'src/test/subscription/t/001_rep_changes.pl' cleanly. Applied patch to 'src/test/subscription/t/007_ddl.pl' cleanly. Applied patch to 'src/test/subscription/t/013_partition.pl' cleanly. Applied patch to 'src/test/subscription/t/027_nosuperuser.pl' cleanly. Applied patch to 'src/test/subscription/t/031_column_list.pl' cleanly. Applied patch to 'src/test/subscription/t/035_conflicts.pl' with conflicts. U src/test/subscription/t/035_conflicts.pl diff --cc src/test/subscription/t/035_conflicts.pl index 741f5397478,f879b18eac3..00000000000 --- a/src/test/subscription/t/035_conflicts.pl +++ b/src/test/subscription/t/035_conflicts.pl @@@ -342,6 -342,15 +342,18 @@@ ok( $node_A->poll_query_until ), "the xmin value of slot 'pg_conflict_detection' is updated on Node A"); ++<<<<<<< ours ++======= + # Confirm that the dead tuple can be removed now + ($cmdret, $stdout, $stderr) = $node_A->psql( + 'postgres', qq(VACUUM (verbose) public.tab;) + ); + + like( $stderr, + qr/1 removed, 1 remain, 0 are dead but not yet removable/, + 'the deleted column is removed'); + ++>>>>>>> theirs ############################################################################### # Ensure that the deleted tuple needed to detect an update_deleted conflict is # accessible via a sequential table scan. @@@ -546,6 -555,13 +558,16 @@@ if ($injection_points_supported != 0 "the xmin value of slot 'pg_conflict_detection' is updated on subscriber" ); ++<<<<<<< ours ++======= + # Confirm that the dead tuple can be removed now + ($cmdret, $stdout, $stderr) = + $node_A->psql('postgres', qq(VACUUM (verbose) public.tab;)); + + like($stderr, qr/1 removed, 0 remain, 0 are dead but not yet removable/, + 'the deleted column is removed'); + ++>>>>>>> theirs # Get the commit timestamp for the publisher's update my $pub_ts = $node_B->safe_psql('postgres', "SELECT pg_xact_commit_timestamp(xmin) from tab where a=1;");