Supporting SJIS as a database encoding
1 patchset tracked - current t35223_80
v80t35223_80posted Mar 27, 2017successwon't retryancient 10ypg 10
baseaeed17d00 Mar 13, 2017 - 3477 days / 23373 commits behind master (from history)
applyapplied Aug 18, 17:00
rebaselast tried Aug 18, 17:00 on 195e8e427
Applying: map_dumper Using index info to reconstruct a base tree... M src/backend/utils/mb/Unicode/Makefile Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/mb/Unicode/Makefile CONFLICT (content): Merge conflict in src/backend/utils/mb/Unicode/Makefile Patch failed at 0001 map_dumper 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/mb/Unicode/Makefile
pushAug 18, 17:00 -> 6eeeb8fa9branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 10 | 435 / 435 | 1m 45s / 5m 38s | docker run ... :t35223 | Aug 18, 17:13 |
run 32163331438executed 435 - ccache 36 hit / 4920 miss - head 6eeeb8fa9 - digest sha256:b1cdeaf3f5b5f0... - run 32163331438 | ||||||