Philip Zeyliger has uploaded this change for review. ( http://gerrit.cloudera.org:8080/10027
Change subject: Add --partial_ok to compare_branches.py. ...................................................................... Add --partial_ok to compare_branches.py. This change lets compare_branches.py succeed with a partial set of cherry-picks. In our case, we sometimes get baacked up with several commits needing to be cherry-picked. The first few cherry-pick fine, and there's a problematic commit sometime down the line. By accepting the first few that cherry-pick fine, someone resolving the conflict can start at where that conflict begins, rather than having to wrangle more commits unnecessarily. I tested this with and without the flag, and confirmed that if the first commit is problematic for cherry-picks, the command does fail. Change-Id: I2a8b34577f9cb74565adf90a2b7d5328bc555f85 Reviewed-on: http://gerrit.cloudera.org:8080/10025 Reviewed-by: Joe McDonnell <joemcdonn...@cloudera.com> Tested-by: Philip Zeyliger <phi...@cloudera.com> (cherry picked from commit a1babea113d46fb69bd4f38b005f9ee02eada200) --- M bin/compare_branches.py 1 file changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.cloudera.org:29418/Impala-ASF refs/changes/27/10027/1 -- To view, visit http://gerrit.cloudera.org:8080/10027 To unsubscribe, visit http://gerrit.cloudera.org:8080/settings Gerrit-Project: Impala-ASF Gerrit-Branch: 2.x Gerrit-MessageType: newchange Gerrit-Change-Id: I2a8b34577f9cb74565adf90a2b7d5328bc555f85 Gerrit-Change-Number: 10027 Gerrit-PatchSet: 1 Gerrit-Owner: Philip Zeyliger <phi...@cloudera.com>
