=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Jan 17 06:03:21 UTC 2026
On branch cf/6337
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v5-0001-Fix-unintended-drop-of-active-replication-origins.patch ===
Applying: Fix unintended drop of active replication origins
Using index info to reconstruct a base tree...
M	contrib/test_decoding/expected/parallel_session_origin.out
M	contrib/test_decoding/specs/parallel_session_origin.spec
M	src/backend/replication/logical/origin.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/logical/origin.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/origin.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 Fix unintended drop of active replication origins
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/replication/logical/origin.c
=== using patch(1) to apply patch ./v5-0001-Fix-unintended-drop-of-active-replication-origins.patch ===
patching file contrib/test_decoding/expected/parallel_session_origin.out
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 65.
2 out of 2 hunks FAILED -- saving rejects to file contrib/test_decoding/expected/parallel_session_origin.out.rej
patching file contrib/test_decoding/specs/parallel_session_origin.spec
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file contrib/test_decoding/specs/parallel_session_origin.spec.rej
patching file src/backend/replication/logical/origin.c
Hunk #1 succeeded at 133 with fuzz 2 (offset 3 lines).
Hunk #2 FAILED at 386.
Hunk #3 FAILED at 1072.
Hunk #4 succeeded at 1214 with fuzz 2 (offset 37 lines).
Hunk #5 FAILED at 1220.
Hunk #6 FAILED at 1239.
Hunk #7 FAILED at 1248.
5 out of 7 hunks FAILED -- saving rejects to file src/backend/replication/logical/origin.c.rej
Unstaged changes after reset:
M	src/backend/replication/logical/origin.c
Removing contrib/test_decoding/expected/parallel_session_origin.out.rej
Removing contrib/test_decoding/specs/parallel_session_origin.spec.rej
Removing src/backend/replication/logical/origin.c.rej
=== using 'git apply' to apply patch ./v5-0001-Fix-unintended-drop-of-active-replication-origins.patch ===
Applied patch to 'contrib/test_decoding/expected/parallel_session_origin.out' cleanly.
Applied patch to 'contrib/test_decoding/specs/parallel_session_origin.spec' cleanly.
Applied patch to 'src/backend/replication/logical/origin.c' with conflicts.
U src/backend/replication/logical/origin.c
diff --cc src/backend/replication/logical/origin.c
index 13808a4674b,1662bed4046..00000000000
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@@ -1078,7 -1075,7 +1078,11 @@@ replorigin_get_progress(RepOriginId nod
  	return remote_lsn;
  }
  
++<<<<<<< ours
 +/* Helper function to reset the session replication origin */
++=======
+ /* Helpful function to reset the session replication origin */
++>>>>>>> theirs
  static void
  replorigin_session_reset_internal(void)
  {