=== Applying patches on top of PostgreSQL commit ID 626d7236b65da50423df7de035e86f273cd36b49 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Tue Mar 25 22:05:28 UTC 2025
On branch cf/5616
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-Expose-f_smgr-to-extensions-for-manual-implementa.patch ===
Applying: Expose f_smgr to extensions for manual implementation
Using index info to reconstruct a base tree...
M	src/backend/postmaster/postmaster.c
M	src/backend/storage/smgr/smgr.c
M	src/backend/utils/init/miscinit.c
M	src/include/miscadmin.h
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/include/miscadmin.h
Auto-merging src/backend/utils/init/miscinit.c
Auto-merging src/backend/storage/smgr/smgr.c
Auto-merging src/backend/postmaster/postmaster.c
=== using 'git am' to apply patch ./v4-0002-Allow-extensions-to-override-the-global-storage-m.patch ===
Applying: Allow extensions to override the global storage manager
Using index info to reconstruct a base tree...
M	src/backend/storage/smgr/smgr.c
M	src/backend/utils/init/miscinit.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/init/miscinit.c
Auto-merging src/backend/storage/smgr/smgr.c
=== using 'git am' to apply patch ./v4-0003-Add-checkpoint_create_hook.patch ===
Applying: Add checkpoint_create_hook
=== using 'git am' to apply patch ./v4-0004-Add-contrib-fsync_checker.patch ===
Applying: Add contrib/fsync_checker
=== using 'git am' to apply patch ./v4-0005-Refactor-smgr-API-mdcreate-needs-the-old-relfilel.patch ===
Applying: Refactor smgr API: mdcreate needs the old relfilelocator
Using index info to reconstruct a base tree...
M	src/backend/access/heap/heapam_handler.c
M	src/backend/catalog/index.c
M	src/backend/commands/tablecmds.c
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/smgr/smgr.c
M	src/backend/utils/cache/relcache.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/cache/relcache.c
Auto-merging src/backend/storage/smgr/smgr.c
CONFLICT (content): Merge conflict in src/backend/storage/smgr/smgr.c
Auto-merging src/backend/storage/buffer/bufmgr.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/catalog/index.c
Auto-merging src/backend/access/heap/heapam_handler.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 Refactor smgr API: mdcreate needs the old relfilelocator
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/backend/access/heap/heapam_handler.c
M	src/backend/access/transam/xlogutils.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/index.c
M	src/backend/catalog/storage.c
M	src/backend/commands/sequence.c
M	src/backend/commands/tablecmds.c
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/smgr/md.c
M	src/backend/storage/smgr/smgr.c
M	src/backend/utils/cache/relcache.c
M	src/include/catalog/storage.h
M	src/include/storage/md.h
M	src/include/storage/smgr.h
=== using patch(1) to apply patch ./v4-0005-Refactor-smgr-API-mdcreate-needs-the-old-relfilel.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./v4-0005-Refactor-smgr-API-mdcreate-needs-the-old-relfilel.patch ===
Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly.
Applied patch to 'src/backend/access/transam/xlogutils.c' cleanly.
Applied patch to 'src/backend/catalog/heap.c' cleanly.
Applied patch to 'src/backend/catalog/index.c' cleanly.
Applied patch to 'src/backend/catalog/storage.c' cleanly.
Applied patch to 'src/backend/commands/sequence.c' cleanly.
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly.
Applied patch to 'src/backend/storage/smgr/md.c' cleanly.
Applied patch to 'src/backend/storage/smgr/smgr.c' with conflicts.
Applied patch to 'src/backend/utils/cache/relcache.c' cleanly.
Applied patch to 'src/include/catalog/storage.h' cleanly.
Applied patch to 'src/include/storage/md.h' cleanly.
Applied patch to 'src/include/storage/smgr.h' cleanly.
U src/backend/storage/smgr/smgr.c
diff --cc src/backend/storage/smgr/smgr.c
index ba1830851c5,0498fd6c317..00000000000
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@@ -456,11 -408,9 +456,15 @@@ smgrexists(SMgrRelation reln, ForkNumbe
   * to be created.
   */
  void
- smgrcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo)
+ smgrcreate(RelFileLocator relold, SMgrRelation reln, ForkNumber forknum, bool isRedo)
  {
++<<<<<<< ours
 +	HOLD_INTERRUPTS();
 +	smgrsw[reln->smgr_which].smgr_create(reln, forknum, isRedo);
 +	RESUME_INTERRUPTS();
++=======
+ 	smgrsw[reln->smgr_which].smgr_create(relold, reln, forknum, isRedo);
++>>>>>>> theirs
  }
  
  /*