Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2514)

Unified Diff: dartium_tools/roll_webkit.sh

Issue 239993009: Revert accidental dartium code push (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dartium_tools/roll_forward.py ('k') | dartium_tools/set_reference_build_revision.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dartium_tools/roll_webkit.sh
diff --git a/dartium_tools/roll_webkit.sh b/dartium_tools/roll_webkit.sh
deleted file mode 100755
index 48077f3e89e14a3e21fd10617f3aaeb24620f3df..0000000000000000000000000000000000000000
--- a/dartium_tools/roll_webkit.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash -e
-
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This script does WebKit roll provided old and new svn revisions.
-
-gitSha() {
- git log --format=%h --grep "git-svn-id: svn://svn.chromium.org/blink/trunk@${1}" blink/master
-}
-
-git checkout master
-git svn rebase
-git fetch blink
-
-old_svn_rev=$1
-new_svn_rev=$2
-
-old_rev="$(gitSha $old_svn_rev)"
-new_rev="$(gitSha $new_svn_rev)"
-
-merge_branch_name="merge-${old_svn_rev}-${new_svn_rev}"
-
-git checkout -b ${merge_branch_name} ${old_rev}
-git diff ${old_rev} ${new_rev} --binary | git apply --binary --index
-# git cherry-pick --no-commit ${old_rev}..${new_rev}
-git commit -m "MERGE: ${old_svn_rev}-${new_svn_rev}."
-git rebase --onto master ${merge_branch_name}~1 ${merge_branch_name}
-
« no previous file with comments | « dartium_tools/roll_forward.py ('k') | dartium_tools/set_reference_build_revision.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698