From 7ff158060631f0e28eefbf2721f2496fd97144cf Mon Sep 17 00:00:00 2001 From: mehrdadn Date: Fri, 8 Jul 2016 19:24:25 +0300 Subject: [PATCH] Apply patches while considering index as well (#231) --- thirdparty/download_thirdparty.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/thirdparty/download_thirdparty.bat b/thirdparty/download_thirdparty.bat index 0bc60b558..889291dc6 100644 --- a/thirdparty/download_thirdparty.bat +++ b/thirdparty/download_thirdparty.bat @@ -10,11 +10,11 @@ git -C "grpc" submodule update --init "third_party/protobuf" git -C "grpc" submodule update --init "third_party/nanopb" git -C "grpc" submodule update --init "third_party/zlib" - git -C "grpc" apply "%~dp0patches/grpc-source.patch" - git -C "grpc" apply "%~dp0patches/windows/grpc-projects.patch" - git -C "grpc/third_party/protobuf" apply "%~dp0patches/windows/protobuf-projects.patch" - git -C "arrow/cpp/thirdparty/flatbuffers" apply "%~dp0patches/windows/flatbuffers-projects.patch" - git -C "arrow/cpp/thirdparty/parquet" apply "%~dp0patches/windows/parquet-endian.patch" - git -C "python" apply "%~dp0patches/windows/python-pyconfig.patch" + git -C "grpc" apply --index --3way "%~dp0patches/grpc-source.patch" + git -C "grpc" apply --index --3way "%~dp0patches/windows/grpc-projects.patch" + git -C "grpc/third_party/protobuf" apply --index --3way "%~dp0patches/windows/protobuf-projects.patch" + git -C "arrow/cpp/thirdparty/flatbuffers" apply --index --3way "%~dp0patches/windows/flatbuffers-projects.patch" + git -C "arrow/cpp/thirdparty/parquet" apply --index --3way "%~dp0patches/windows/parquet-endian.patch" + git -C "python" apply --index --3way "%~dp0patches/windows/python-pyconfig.patch" @PopD @EndLocal