Minor documentation error regarding streaming replication protocol

back to CI dashboard

1 patchset tracked - current t42936_24

v24t42936_24posted Dec 15, 2020successwon't retryancient 6ypg 14
base415dc2009 Dec 01, 2020 - 2118 days / 15110 commits behind master (from history)
applyapplied Aug 18, 16:05
rebaselast tried Aug 18, 16:05 on 195e8e427
Applying: Enforce ASCII restore point names.
Using index info to reconstruct a base tree...
M	doc/src/sgml/protocol.sgml
M	src/backend/access/transam/xlogfuncs.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/access/transam/xlogfuncs.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlogfuncs.c
Auto-merging doc/src/sgml/protocol.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/protocol.sgml
Patch failed at 0001 Enforce ASCII restore point names.

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/backend/access/transam/xlogfuncs.c, doc/src/sgml/protocol.sgml
pushAug 18, 16:06 -> 1c466495fbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success114588 / 5882m 07s / 3m 04sdocker run ... :t42936Aug 18, 16:14
run 32158415311
executed 588 - ccache 209 hit / 4121 miss - head 1c466495f - digest sha256:4fccfe8bf7cf1e... - run 32158415311