future of PQfn()
2 patchsets tracked - current t139751_19
v19t139751_19posted Aug 06, 18:41infra errorwon't retrystale 45dpg 20
v18t139751_18posted Jun 04, 14:57successsupersededstale 4mopg 19
base020794ee4 May 13, 14:34 - 130 days / 1152 commits behind master (from history)
applyapplied Jul 28, 14:41
rebaselast tried Jul 28, 14:41 on 8a045f760
Applying: remove PQfn Using index info to reconstruct a base tree... M doc/src/sgml/appendix-obsolete.sgml M doc/src/sgml/filelist.sgml M src/interfaces/libpq/fe-lobj.c Falling back to patching base and 3-way merge... Auto-merging src/interfaces/libpq/fe-lobj.c Auto-merging doc/src/sgml/filelist.sgml CONFLICT (content): Merge conflict in doc/src/sgml/filelist.sgml Auto-merging doc/src/sgml/appendix-obsolete.sgml CONFLICT (content): Merge conflict in doc/src/sgml/appendix-obsolete.sgml Patch failed at 0001 remove PQfn 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: doc/src/sgml/filelist.sgml, doc/src/sgml/appendix-obsolete.sgml
pushJul 28, 14:42 -> c5c2a528bbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1002 / 1002 | 2m 46s / 5m 08s | docker run ... :t139751 | Jul 28, 14:53 |
run 30369663351executed 1002 - ccache 145 hit / 6474 miss - head c5c2a528b - digest sha256:718388c0216727... - run 30369663351 | ||||||