=== Applying patches on top of PostgreSQL commit ID e82e9aaa6a2942505c2c328426778787e4976ea6 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Dec 26 23:39:19 UTC 2025
On branch cf/6119
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-Migration-of-the-pg_commit_ts-directory.patch ===
Applying: Migration of the pg_commit_ts directory
Using index info to reconstruct a base tree...
M	src/bin/pg_upgrade/check.c
M	src/bin/pg_upgrade/meson.build
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/pg_upgrade.h
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_upgrade/pg_upgrade.h
Auto-merging src/bin/pg_upgrade/pg_upgrade.c
Auto-merging src/bin/pg_upgrade/meson.build
CONFLICT (content): Merge conflict in src/bin/pg_upgrade/meson.build
Auto-merging src/bin/pg_upgrade/check.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 Migration of the pg_commit_ts directory
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_upgrade/check.c
M	src/bin/pg_upgrade/controldata.c
M	src/bin/pg_upgrade/meson.build
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/pg_upgrade.h
Removing src/bin/pg_upgrade/t/007_transfer_commit_ts.pl
=== using patch(1) to apply patch ./v7-0001-Migration-of-the-pg_commit_ts-directory.patch ===
patching file src/bin/pg_upgrade/check.c
patching file src/bin/pg_upgrade/controldata.c
patching file src/bin/pg_upgrade/meson.build
Hunk #1 FAILED at 47.
1 out of 1 hunk FAILED -- saving rejects to file src/bin/pg_upgrade/meson.build.rej
patching file src/bin/pg_upgrade/pg_upgrade.c
Hunk #1 succeeded at 773 (offset 1 line).
Hunk #2 succeeded at 786 (offset 1 line).
Hunk #3 succeeded at 819 (offset 1 line).
patching file src/bin/pg_upgrade/pg_upgrade.h
Hunk #1 succeeded at 245 with fuzz 1 (offset 7 lines).
patching file src/bin/pg_upgrade/t/007_transfer_commit_ts.pl
Unstaged changes after reset:
M	src/bin/pg_upgrade/check.c
M	src/bin/pg_upgrade/controldata.c
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/pg_upgrade.h
Removing src/bin/pg_upgrade/meson.build.rej
Removing src/bin/pg_upgrade/t/007_transfer_commit_ts.pl
=== using 'git apply' to apply patch ./v7-0001-Migration-of-the-pg_commit_ts-directory.patch ===
Applied patch to 'src/bin/pg_upgrade/check.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/controldata.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/meson.build' with conflicts.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.h' cleanly.
Falling back to direct application...
U src/bin/pg_upgrade/meson.build
diff --cc src/bin/pg_upgrade/meson.build
index 41f1126206b,030618152d0..00000000000
--- a/src/bin/pg_upgrade/meson.build
+++ b/src/bin/pg_upgrade/meson.build
@@@ -50,7 -47,7 +50,11 @@@ tests += 
        't/004_subscription.pl',
        't/005_char_signedness.pl',
        't/006_transfer_modes.pl',
++<<<<<<< ours
 +      't/007_multixact_conversion.pl',
++=======
+       't/007_transfer_commit_ts.pl',
++>>>>>>> theirs
      ],
      'test_kwargs': {'priority': 40}, # pg_upgrade tests are slow
    },