=== Applying patches on top of PostgreSQL commit ID 15d33eb1924c1093102b8ce142ede4cb3912e85e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Jul 24 16:58:18 UTC 2025
On branch cf/5029
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0002-Add-test-case-snapshot_build-for-test_decoding.patch ===
Applying: Add test case snapshot_build for test_decoding.
Using index info to reconstruct a base tree...
M	contrib/test_decoding/Makefile
M	contrib/test_decoding/meson.build
Falling back to patching base and 3-way merge...
Auto-merging contrib/test_decoding/meson.build
CONFLICT (content): Merge conflict in contrib/test_decoding/meson.build
Auto-merging contrib/test_decoding/Makefile
CONFLICT (content): Merge conflict in contrib/test_decoding/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add test case snapshot_build for test_decoding.
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	contrib/test_decoding/Makefile
M	contrib/test_decoding/meson.build
Removing contrib/test_decoding/expected/snapshot_build.out
Removing contrib/test_decoding/specs/snapshot_build.spec
=== using patch(1) to apply patch ./v3-0002-Add-test-case-snapshot_build-for-test_decoding.patch ===
patching file contrib/test_decoding/Makefile
Hunk #1 FAILED at 9.
1 out of 1 hunk FAILED -- saving rejects to file contrib/test_decoding/Makefile.rej
patching file contrib/test_decoding/expected/snapshot_build.out
patching file contrib/test_decoding/meson.build
Hunk #1 FAILED at 63.
1 out of 1 hunk FAILED -- saving rejects to file contrib/test_decoding/meson.build.rej
patching file contrib/test_decoding/specs/snapshot_build.spec
Removing contrib/test_decoding/Makefile.rej
Removing contrib/test_decoding/expected/snapshot_build.out
Removing contrib/test_decoding/meson.build.rej
Removing contrib/test_decoding/specs/snapshot_build.spec
=== using 'git apply' to apply patch ./v3-0002-Add-test-case-snapshot_build-for-test_decoding.patch ===
Applied patch to 'contrib/test_decoding/Makefile' with conflicts.
Falling back to direct application...
Applied patch to 'contrib/test_decoding/meson.build' with conflicts.
Falling back to direct application...
U contrib/test_decoding/Makefile
U contrib/test_decoding/meson.build
diff --cc contrib/test_decoding/Makefile
index 02e961f4d31,8113e2d99c9..00000000000
--- a/contrib/test_decoding/Makefile
+++ b/contrib/test_decoding/Makefile
@@@ -9,7 -9,7 +9,11 @@@ REGRESS = ddl xact rewrite toast permis
  ISOLATION = mxact delayed_startup ondisk_startup concurrent_ddl_dml \
  	oldest_xmin snapshot_transfer subxact_without_top concurrent_stream \
  	twophase_snapshot slot_creation_error catalog_change_snapshot \
++<<<<<<< ours
 +	skip_snapshot_restore invalidation_distribution
++=======
+ 	skip_snapshot_restore snapshot_build
++>>>>>>> theirs
  
  REGRESS_OPTS = --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf
  ISOLATION_OPTS = --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf
diff --cc contrib/test_decoding/meson.build
index 25f6b8a9082,2b7e80ba71b..00000000000
--- a/contrib/test_decoding/meson.build
+++ b/contrib/test_decoding/meson.build
@@@ -63,7 -63,7 +63,11 @@@ tests += 
        'twophase_snapshot',
        'slot_creation_error',
        'skip_snapshot_restore',
++<<<<<<< ours
 +      'invalidation_distribution',
++=======
+       'snapshot_build',
++>>>>>>> theirs
      ],
      'regress_args': [
        '--temp-config', files('logical.conf'),