=== Applying patches on top of PostgreSQL commit ID 786552e7f22315c4103c5404f9c4c6bccc95f8c1 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Mar 31 04:27:25 UTC 2026
On branch cf/6609
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Check-fclose-failures-in-more-places.patch ===
Applying: Check fclose() failures in more places
Using index info to reconstruct a base tree...
M	src/backend/postmaster/postmaster.c
M	src/bin/pg_basebackup/pg_createsubscriber.c
M	src/fe_utils/astreamer_file.c
Falling back to patching base and 3-way merge...
Auto-merging src/fe_utils/astreamer_file.c
CONFLICT (content): Merge conflict in src/fe_utils/astreamer_file.c
Auto-merging src/bin/pg_basebackup/pg_createsubscriber.c
Auto-merging src/backend/postmaster/postmaster.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Check fclose() failures in more places
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".
=== using patch(1) to apply patch ./v1-0001-Check-fclose-failures-in-more-places.patch ===
patching file src/backend/postmaster/postmaster.c
Hunk #1 succeeded at 1292 (offset -8 lines).
Hunk #2 succeeded at 4116 (offset -8 lines).
patching file src/bin/pg_basebackup/pg_createsubscriber.c
Hunk #1 succeeded at 1648 with fuzz 2 (offset 258 lines).
patching file src/bin/pg_dump/pg_dumpall.c
patching file src/bin/pg_upgrade/pg_upgrade.c
patching file src/fe_utils/astreamer_file.c
Hunk #1 FAILED at 266.
1 out of 1 hunk FAILED -- saving rejects to file src/fe_utils/astreamer_file.c.rej
patching file src/fe_utils/recovery_gen.c
Unstaged changes after reset:
M	src/backend/postmaster/postmaster.c
M	src/bin/pg_basebackup/pg_createsubscriber.c
M	src/bin/pg_dump/pg_dumpall.c
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/fe_utils/recovery_gen.c
Removing src/fe_utils/astreamer_file.c.rej
=== using 'git apply' to apply patch ./v1-0001-Check-fclose-failures-in-more-places.patch ===
Applied patch to 'src/backend/postmaster/postmaster.c' cleanly.
Applied patch to 'src/bin/pg_basebackup/pg_createsubscriber.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dumpall.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.c' cleanly.
Applied patch to 'src/fe_utils/astreamer_file.c' with conflicts.
Applied patch to 'src/fe_utils/recovery_gen.c' cleanly.
U src/fe_utils/astreamer_file.c
diff --cc src/fe_utils/astreamer_file.c
index 158e9a14f2c,33da0bc980b..00000000000
--- a/src/fe_utils/astreamer_file.c
+++ b/src/fe_utils/astreamer_file.c
@@@ -267,8 -267,7 +267,12 @@@ astreamer_extractor_content(astreamer *
  			if (mystreamer->file == NULL)
  				break;
  			if (fclose(mystreamer->file) != 0)
++<<<<<<< ours
 +				pg_fatal("could not close file \"%s\": %m",
 +						 mystreamer->filename);
++=======
+ 				pg_fatal("could not close file \"%s\": %m", mystreamer->filename);
++>>>>>>> theirs
  			mystreamer->file = NULL;
  			break;