=== Applying patches on top of PostgreSQL commit ID d6bf0ab1704c62f94875d25dd71c4baa1feac5be ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Aug 12 09:42:24 UTC 2026
On branch cf/7065
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Remove-unnecessary-list_free.patch ===
Applying: Remove unnecessary list_free
Using index info to reconstruct a base tree...
M	src/backend/commands/publicationcmds.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/publicationcmds.c
CONFLICT (content): Merge conflict in src/backend/commands/publicationcmds.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 Remove unnecessary list_free
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 ./v3-0001-Remove-unnecessary-list_free.patch ===
patching file src/backend/commands/publicationcmds.c
Hunk #1 FAILED at 1977.
1 out of 1 hunk FAILED -- saving rejects to file src/backend/commands/publicationcmds.c.rej
Removing src/backend/commands/publicationcmds.c.rej
=== using 'git apply' to apply patch ./v3-0001-Remove-unnecessary-list_free.patch ===
Applied patch to 'src/backend/commands/publicationcmds.c' with conflicts.
U src/backend/commands/publicationcmds.c
diff --cc src/backend/commands/publicationcmds.c
index 96838730fe1,2a21917dc4c..00000000000
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@@ -1977,6 -1977,12 +1977,15 @@@ OpenTableList(List *tables
  		}
  	}
  
++<<<<<<< ours
++=======
+ 	/*
+ 	 * No need to free the Lists here -- this function runs at most once per
+ 	 * DDL command, and the memory will be reclaimed when that command's
+ 	 * context is torn down.
+ 	 */
+ 
++>>>>>>> theirs
  	return rels;
  }