Fix comment in report_sequence_errors()
1 patchset tracked - current t139893_1
v1t139893_1posted Jun 07, 14:35successwon't retrystale 4mopg 19
base2bf6c9ff7 Apr 30, 11:09 - 115 days / 985 commits behind master (from history)
applyapplied Jul 29, 00:36
rebaselast tried Jul 29, 00:36 on dd50eb914
Applying: Fix wrong comment in report_sequence_errors() Using index info to reconstruct a base tree... M src/backend/replication/logical/sequencesync.c Falling back to patching base and 3-way merge... Auto-merging src/backend/replication/logical/sequencesync.c CONFLICT (content): Merge conflict in src/backend/replication/logical/sequencesync.c Patch failed at 0001 Fix wrong comment in report_sequence_errors() 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/replication/logical/sequencesync.c
pushJul 29, 00:36 -> 6027c906fbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 998 / 998 | 2m 58s / 5m 11s | docker run ... :t139893 | Jul 29, 00:52 |
run 30411666095executed 998 - ccache 78 hit / 6540 miss - head 6027c906f - digest sha256:4708004ee2b968... - run 30411666095 | ||||||