diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-05 14:18:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-05 14:44:38 +0100 |
| commit | f4ce3e600c5f52b07bbf25304694149c262d023a (patch) | |
| tree | 1064894f9fc47eade785d5b29c74c3674d813a85 /README | |
| parent | 66ed8d0f354d29f44135b817061e8e65f7d4f1c7 (diff) | |
Added helper script for easier V8 updates
It won't take away the pain of resolving conflicts, but it'll hide
the git magic from you :)
Change-Id: I6901ca8edb8263ea733a3d4b94393a06e8f25731
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'README')
| -rw-r--r-- | README | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -5,16 +5,19 @@ affects V8 itself and not the build system around it. Updating v8: -1) Reset src/3rdparty/v8 to a V8 commit of your choice, for example: +Run - git fetch https://github.com/v8/v8.git refs/tags/3.7.2 - git rm --cached -r src/3rdparty/v8 - git read-tree --prefix=src/3rdparty/v8 FETCH_HEAD - git checkout src/3rdparty/v8 - git commit + ./bin/update-v8.sh [url] [refspec] -2) Cherry-pick our modifications from before: +to update src/3rdparty/v8 to a specific v8 version. The script will remove +all Qt specific modifications and save them in /tmp/v8_patch, where they +can be applied from using git am. - gitk src/3rdparty/v8 +For example: - and then cherry-pick the changes since the last v8 import. + ./bin/update-v8.sh https://github.com/v8/v8.git refs/tags/3.7.3 + git commit -e -F commitlog.txt + git am -3 /tmp/v8_patch + +In the likely case of conflicts, follow the git instructions about continuing +the patch application process after resolving the conflicts. |