pg_verify_checksums -r option
1 patchset tracked - current t39250_23
v23t39250_23posted Sep 03, 2018successwon't retryancient 8ypg 12
base44cac9346 Sep 01, 2018 - 2940 days / 19898 commits behind master (from history)
applyapplied Aug 18, 16:40
rebaselast tried Aug 18, 16:40 on 195e8e427
Applying: Allow pg_verify_checksums to specify a database to scan Using index info to reconstruct a base tree... A doc/src/sgml/ref/pg_verify_checksums.sgml A src/bin/pg_verify_checksums/pg_verify_checksums.c Falling back to patching base and 3-way merge... CONFLICT (modify/delete): src/bin/pg_verify_checksums/pg_verify_checksums.c deleted in HEAD and modified in Allow pg_verify_checksums to specify a database to scan. Version Allow pg_verify_checksums to specify a database to scan of src/bin/pg_verify_checksums/pg_verify_checksums.c left in tree. CONFLICT (modify/delete): doc/src/sgml/ref/pg_verify_checksums.sgml deleted in HEAD and modified in Allow pg_verify_checksums to specify a database to scan. Version Allow pg_verify_checksums to specify a database to scan of doc/src/sgml/ref/pg_verify_checksums.sgml left in tree. Patch failed at 0001 Allow pg_verify_checksums to specify a database to scan 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/bin/pg_verify_checksums/pg_verify_checksums.c, doc/src/sgml/ref/pg_verify_checksums.sgml
pushAug 18, 16:40 -> be9e552b9branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 12 | 514 / 514 | 1m 49s / 3m 02s | docker run ... :t39250 | Aug 18, 16:49 |
run 32161568537executed 514 - ccache 155 hit / 3906 miss - head be9e552b9 - digest sha256:3df09aac24d6ba... - run 32161568537 | ||||||