Meson doesn't define HAVE_LOCALE_T for mscv

back to CI dashboard

1 patchset tracked - current t46910_4

v4t46910_4posted Nov 15, 2022successwon't retryancient 4ypg 16
base373679c4a Nov 11, 2022 - 1408 days / 10536 commits behind master (from history)
applyapplied Aug 18, 15:27
rebaselast tried Aug 18, 15:27 on 195e8e427
Applying: meson define HAVE_LOCALE_T for MinGW
Using index info to reconstruct a base tree...
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
CONFLICT (content): Merge conflict in meson.build
Patch failed at 0001 meson define HAVE_LOCALE_T for MinGW

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: meson.build
pushAug 18, 15:28 -> 015279964branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success116666 / 6662m 47s / 4m 24sdocker run ... :t46910Aug 18, 15:39
run 32154620282
executed 666 - ccache 213 hit / 4334 miss - head 015279964 - digest sha256:ee245c274068c2... - run 32154620282