=== 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 15:55:20 UTC 2025
On branch cf/5303
nothing to commit, working tree clean
=== using 'git am' to apply patch ./skip_xid_correctly.diff ===
Patch format detection failed.
=== using patch(1) to apply patch ./skip_xid_correctly.diff ===
patching file src/test/modules/xid_wraparound/xid_wraparound.c
Hunk #2 FAILED at 35.
1 out of 4 hunks FAILED -- saving rejects to file src/test/modules/xid_wraparound/xid_wraparound.c.rej
Unstaged changes after reset:
M	src/test/modules/xid_wraparound/xid_wraparound.c
Removing src/test/modules/xid_wraparound/xid_wraparound.c.rej
=== using 'git apply' to apply patch ./skip_xid_correctly.diff ===
/work/patches/./skip_xid_correctly.diff:38: trailing whitespace.
	 * 
Applied patch to 'src/test/modules/xid_wraparound/xid_wraparound.c' with conflicts.
U src/test/modules/xid_wraparound/xid_wraparound.c
warning: 1 line adds whitespace errors.
diff --cc src/test/modules/xid_wraparound/xid_wraparound.c
index e27a5fa5769,63f3305ee93..00000000000
--- a/src/test/modules/xid_wraparound/xid_wraparound.c
+++ b/src/test/modules/xid_wraparound/xid_wraparound.c
@@@ -34,11 -35,8 +35,16 @@@ consume_xids(PG_FUNCTION_ARGS
  	int64		nxids = PG_GETARG_INT64(0);
  	FullTransactionId lastxid;
  
++<<<<<<< ours
 +	if (nxids < 0)
 +		elog(ERROR, "invalid nxids argument: %" PRId64, nxids);
 +
 +	if (nxids == 0)
 +		lastxid = ReadNextFullTransactionId();
++=======
+ 	if (nxids <= 0)
+ 		elog(ERROR, "invalid nxids argument: %lld", (long long) nxids);
++>>>>>>> theirs
  	else
  		lastxid = consume_xids_common(InvalidFullTransactionId, (uint64) nxids);