| OLD | NEW |
| (Empty) |
| 1 #!/bin/bash -e | |
| 2 | |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | |
| 4 # Use of this source code is governed by a BSD-style license that can be | |
| 5 # found in the LICENSE file. | |
| 6 | |
| 7 # This script does WebKit roll provided old and new svn revisions. | |
| 8 | |
| 9 gitSha() { | |
| 10 git log --format=%h --grep "git-svn-id: svn://svn.chromium.org/blink/trunk@${1
}" blink/master | |
| 11 } | |
| 12 | |
| 13 git checkout master | |
| 14 git svn rebase | |
| 15 git fetch blink | |
| 16 | |
| 17 old_svn_rev=$1 | |
| 18 new_svn_rev=$2 | |
| 19 | |
| 20 old_rev="$(gitSha $old_svn_rev)" | |
| 21 new_rev="$(gitSha $new_svn_rev)" | |
| 22 | |
| 23 merge_branch_name="merge-${old_svn_rev}-${new_svn_rev}" | |
| 24 | |
| 25 git checkout -b ${merge_branch_name} ${old_rev} | |
| 26 git diff ${old_rev} ${new_rev} --binary | git apply --binary --index | |
| 27 # git cherry-pick --no-commit ${old_rev}..${new_rev} | |
| 28 git commit -m "MERGE: ${old_svn_rev}-${new_svn_rev}." | |
| 29 git rebase --onto master ${merge_branch_name}~1 ${merge_branch_name} | |
| 30 | |
| OLD | NEW |