BackgroundPsql swallowing errors on windows
1 patchset tracked - current t51068_45
v45t51068_45posted Jun 15, 13:43no CIwon't retrystale 2mopg 19
base44196fd4f Jun 11, 23:32 - 73 days / 698 commits behind master (from history)
applyapplied 6 days ago
rebaselast tried 6 days ago on 033f39e69
Applying: Convert TAP tests to PostgreSQL::Test::Session Using index info to reconstruct a base tree... M src/test/authentication/t/001_password.pl M src/test/modules/oauth_validator/t/001_server.pl M src/test/modules/test_checksums/t/002_restarts.pl M src/test/modules/test_misc/t/013_temp_obj_multisession.pl M src/test/modules/xid_wraparound/t/002_limits.pl M src/test/recovery/t/042_low_level_backup.pl M src/test/recovery/t/049_wait_for_lsn.pl M src/test/recovery/t/050_redo_segment_missing.pl M src/test/recovery/t/051_effective_wal_level.pl M src/test/subscription/t/035_conflicts.pl M src/test/subscription/t/038_walsnd_shutdown_timeout.pl Falling back to patching base and 3-way merge... Auto-merging src/test/subscription/t/038_walsnd_shutdown_timeout.pl CONFLICT (content): Merge conflict in src/test/subscription/t/038_walsnd_shutdown_timeout.pl Auto-merging src/test/subscription/t/035_conflicts.pl Auto-merging src/test/recovery/t/051_effective_wal_level.pl CONFLICT (content): Merge conflict in src/test/recovery/t/051_effective_wal_level.pl Auto-merging src/test/recovery/t/050_redo_segment_missing.pl Auto-merging src/test/recovery/t/049_wait_for_lsn.pl Auto-merging src/test/recovery/t/042_low_level_backup.pl Auto-merging src/test/modules/xid_wraparound/t/002_limits.pl Auto-merging src/test/modules/test_misc/t/013_temp_obj_multisession.pl Auto-merging src/test/modules/test_checksums/t/002_restarts.pl Auto-merging src/test/modules/oauth_validator/t/001_server.pl Auto-merging src/test/authentication/t/001_password.pl Patch failed at 0001 Convert TAP tests to PostgreSQL::Test::Session error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/test/subscription/t/038_walsnd_shutdown_timeout.pl, src/test/recovery/t/051_effective_wal_level.pl
skippedpatchset touches .github/