BUG #15460: Error while creating index or constraint
1 patchset tracked - current t68710_42
v42t68710_42posted Nov 29, 2018successwon't retryancient 8ypg 12
base3cb646264 Jul 18, 2018 - 2985 days / 20133 commits behind master (from history)
applyapplied Aug 18, 16:36
rebaselast tried Aug 18, 16:36 on 195e8e427
Applying: Detach from DSM segments last in resowner.c. Using index info to reconstruct a base tree... M src/backend/utils/resowner/resowner.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/resowner/resowner.c CONFLICT (content): Merge conflict in src/backend/utils/resowner/resowner.c Patch failed at 0001 Detach from DSM segments last in resowner.c. 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/utils/resowner/resowner.c
pushAug 18, 16:36 -> e59b03950branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 12 | 509 / 509 | 1m 27s / 2m 46s | docker run ... :t68710 | Aug 18, 16:44 |
run 32161247348executed 509 - ccache 84 hit / 3975 miss - head e59b03950 - digest sha256:90e4eb0b049ef1... - run 32161247348 | ||||||