You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2021/06/04 19:00:31 UTC

[GitHub] [arrow-rs] alamb commented on pull request #386: add more tests for window::shift and handle boundary cases

alamb commented on pull request #386:
URL: https://github.com/apache/arrow-rs/pull/386#issuecomment-854939802


   FWIW I could not cherry-pick this automatically to `active_release` (what will become release version 4.3):
   
   ```
   @ip-10-0-0-124:~/Software/arrow-rs$ CHERRY_PICK_SHA=45acc62    ARROW_GITHUB_API_TOKEN=$ARROW_GITHUB_API_TOKEN CHECKOUT_ROOT=/tmp/arrow-rs  python3 dev/release/cherry-pick-pr.py
   CHERRY_PICK_SHA=45acc62    ARROW_GITHUB_API_TOKEN=$ARROW_GITHUB_API_TOKEN CHECKOUT_ROOT=/tmp/arrow-rs  python3 dev/release/cherry-pick-pr.py
   Using checkout in /tmp/arrow-rs
   Creating cherry pick from 45acc62c to cherry_pick_45acc62c
   remote: Total 0 (delta 0), reused 0 (delta 0), pack-reused 0        
   From github.com:apache/arrow-rs
    * branch              master     -> FETCH_HEAD
   From github.com:apache/arrow-rs
    * branch              active_release -> FETCH_HEAD
   Switched to a new branch 'cherry_pick_45acc62c'
   error: could not apply 45acc62c... add more tests for window::shift and handle boundary cases (#386)
   hint: after resolving the conflicts, mark the corrected paths
   hint: with 'git add <paths>' or 'git rm <paths>'
   hint: and commit the result with 'git commit'
   Command failed: ['git', 'cherry-pick', '45acc62']
   With output:
   --------------
   b'Auto-merging arrow/src/compute/kernels/window.rs\nCONFLICT (content): Merge conflict in arrow/src/compute/kernels/window.rs\n'
   --------------
   Traceback (most recent call last):
     File "/Users/alamb/Software/arrow-rs/dev/release/cherry-pick-pr.py", line 153, in <module>
       make_cherry_pick()
     File "/Users/alamb/Software/arrow-rs/dev/release/cherry-pick-pr.py", line 116, in make_cherry_pick
       run_cmd(['git', 'cherry-pick', new_sha])
     File "/Users/alamb/Software/arrow-rs/dev/release/cherry-pick-pr.py", line 78, in run_cmd
       raise e
     File "/Users/alamb/Software/arrow-rs/dev/release/cherry-pick-pr.py", line 70, in run_cmd
       output = subprocess.check_output(cmd)
     File "/usr/local/Cellar/python@3.9/3.9.5/Frameworks/Python.framework/Versions/3.9/lib/python3.9/subprocess.py", line 424, in check_output
       return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
     File "/usr/local/Cellar/python@3.9/3.9.5/Frameworks/Python.framework/Versions/3.9/lib/python3.9/subprocess.py", line 528, in run
       raise CalledProcessError(retcode, process.args,
   subprocess.CalledProcessError: Command '['git', 'cherry-pick', '45acc62']' returned non-zero exit status 1.
   ```
   
   If we want to include it we will have to backport it manually


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org