=== Applying patches on top of PostgreSQL commit ID 322bab79744dfb8f7ddb5191b3102cf7986d14a0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sun Mar 22 02:44:27 UTC 2026
On branch cf/5495
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v01_pg_restore-don-t-edit-inputfile-name-instead-use-local.patch ===
Applying: pg_restore: don't edit inputfile name, instead use local copy
Using index info to reconstruct a base tree...
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
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: don't edit inputfile name, instead use local copy
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_restore.c
=== using patch(1) to apply patch ./v01_pg_restore-don-t-edit-inputfile-name-instead-use-local.patch ===
patching file src/bin/pg_dump/pg_restore.c
Hunk #1 FAILED at 68.
Hunk #2 FAILED at 1082.
Hunk #3 FAILED at 1206.
3 out of 3 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_restore.c.rej
Removing src/bin/pg_dump/pg_restore.c.rej
=== using 'git apply' to apply patch ./v01_pg_restore-don-t-edit-inputfile-name-instead-use-local.patch ===
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 f016b336308,54c8b9d48b0..00000000000
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@@ -68,7 -68,7 +68,11 @@@ static int	restore_all_databases(const 
  static int	get_dbnames_list_to_restore(PGconn *conn,
  										SimplePtrList *dbname_oid_list,
  										SimpleStringList db_exclude_patterns);
++<<<<<<< ours
 +static int	get_dbname_oid_list_from_mfile(const char *dumpdirpath,
++=======
+ static int	get_dbname_oid_list_from_mfile(const char *dumpdirpatharg,
++>>>>>>> theirs
  										   SimplePtrList *dbname_oid_list);
  
  /*
@@@ -1048,17 -1082,22 +1052,30 @@@ get_dbnames_list_to_restore(PGconn *con
   * Returns, total number of database names in map.dat file.
   */
  static int
++<<<<<<< ours
 +get_dbname_oid_list_from_mfile(const char *dumpdirpath,
 +							   SimplePtrList *dbname_oid_list)
++=======
+ get_dbname_oid_list_from_mfile(const char *dumpdirpatharg, SimplePtrList *dbname_oid_list)
++>>>>>>> theirs
  {
  	StringInfoData linebuf;
  	FILE	   *pfile;
  	char		map_file_path[MAXPGPATH];
  	int			count = 0;
++<<<<<<< ours
++=======
+ 	int			len;
+ 	char			*dumpdirpath;
+ 
+ 	len = strlen(dumpdirpatharg);
+ 	dumpdirpath = pg_malloc0(len + 1);
+ 	memcpy(dumpdirpath, dumpdirpatharg, len);
++>>>>>>> theirs
  
  	/*
 -	 * If there is no map.dat file in dump, then return from here as there is
 -	 * no database to restore.
 +	 * If there is no map.dat file in the dump, then return from here as there
 +	 * is no database to restore.
  	 */
  	if (!file_exists_in_directory(dumpdirpath, "map.dat"))
  	{