You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@parquet.apache.org by Wes McKinney <we...@gmail.com> on 2018/09/13 21:50:08 UTC

How to move patches from apache/parquet-cpp to apache/arrow

hi folks,

One way to move your patches from apache/parquet-cpp to apache/arrow
is as follows:

1. Use git rebase -i master and squash your commits into a single
patch. By sure to pull latest master from upstream

2. Use git filter-branch to prune the codebase as in the merge

# Remove everything except src/parquet
git filter-branch -f --tree-filter "find . -not -path './.git' -not
-path './.git/*' -not -path './src' -not -path './src/parquet' -not
-path './src/parquet/*' -delete" --prune-empty

# Move src/parquet to cpp/src/parquet
git filter-branch -f --tree-filter 'mkdir -p cpp/src && test -d
src/parquet && mv src/parquet cpp/src/parquet || echo "Nothing to do"'
HEAD

3. Add your local parquet-cpp clone as a remote in apache/arrow

# create a new branch for your patch
git checkout -b PARQUET-ABCD

# Call this from your arrow clone, assuming arrow and parquet-cpp are
sibling directories
git add parquet-cpp-clone ../parquet-cpp

4. Cherry-pick the single commit produced by steps 1 and 2

git cherry-pick HASH

5. Open a new PR into apache/arrow

Please let me know if you require assistance.

Thanks
Wes