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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 2962723003: Revert of Roll chromium_revision 0591491eb3..1b96d497c1 (482698:482761) (Closed)

Created:
3 years, 5 months ago by kjellander_webrtc
Modified:
3 years, 4 months ago
Reviewers:
buildbot
CC:
webrtc-reviews_webrtc.org, qiang.lu, niklas.enbom, yujie_mao (webrtc), peah-webrtc, charujain
Target Ref:
refs/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Roll chromium_revision 0591491eb3..1b96d497c1 (482698:482761) (patchset #1 id:1 of https://codereview.webrtc.org/2955123003/ ) Reason for revert: Breaks internal project. Previous roll was already reverted in https://codereview.webrtc.org/2957243002 but the autoroller wasn't halted so this was relanded here. Original issue's description: > Roll chromium_revision 0591491eb3..1b96d497c1 (482698:482761) > > Change log: https://chromium.googlesource.com/chromium/src/+log/0591491eb3..1b96d497c1 > Full diff: https://chromium.googlesource.com/chromium/src/+/0591491eb3..1b96d497c1 > > Changed dependencies: > * src/base: https://chromium.googlesource.com/chromium/src/base/+log/990ff1f30a..f8bde9c273 > * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/7f2cacbbe2..1dcd1bdbe9 > * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/14a5caf272..c7dda527c5 > * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/8a4dce9dfe..5b41a1d1ad > * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/a739549138..15594769ca > * src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/45d20f29a9..bdff8501d7 > * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/659830978f..44e2f6ae79 > DEPS diff: https://chromium.googlesource.com/chromium/src/+/0591491eb3..1b96d497c1/DEPS > > No update to Clang. > > TBR= > BUG=None > > Review-Url: https://codereview.webrtc.org/2955123003 > Cr-Commit-Position: refs/heads/master@{#18793} > Committed: https://chromium.googlesource.com/external/webrtc/+/fadfc5e4c018d76cd9d713093d508c2eeddd2926 TBR=buildbot@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=b/63085354

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+8 lines, -8 lines) Patch
M DEPS View 5 chunks +8 lines, -8 lines 0 comments Download

Messages

Total messages: 7 (3 generated)
kjellander_webrtc
Created Revert of Roll chromium_revision 0591491eb3..1b96d497c1 (482698:482761)
3 years, 5 months ago (2017-06-28 08:16:58 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at: https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2962723003/1
3 years, 5 months ago (2017-06-28 08:17:38 UTC) #4
commit-bot: I haz the power
Failed to apply patch for DEPS: While running git apply --index -3 -p1; error: patch ...
3 years, 5 months ago (2017-06-28 08:17:46 UTC) #6
kjellander_webrtc
3 years, 5 months ago (2017-06-28 08:22:19 UTC) #7 
On 2017/06/28 08:17:46, commit-bot: I haz the power wrote:
> Failed to apply patch for DEPS:
> While running git apply --index -3 -p1;
>   error: patch failed: DEPS:2
>   Falling back to three-way merge...
>   Applied patch to 'DEPS' with conflicts.
>   U DEPS
> 
> Patch:       DEPS
> Index: DEPS
> diff --git a/DEPS b/DEPS
> index
>
fc2ca682d518a173d97c30eb594df54cebe5d796..5e7645106056ef4e78a550b0381a7eab308f0e86
> 100644
> --- a/DEPS
> +++ b/DEPS
> @@ -2,7 +2,7 @@
>  
>  vars = {
>    'chromium_git': 'https://chromium.googlesource.com',
> -  'chromium_revision': '1b96d497c1ad96d0f546f46a9277434defadbddd',
> +  'chromium_revision': '0591491eb3bd9b7e416ba5dce25bbd667b75bd6a',
>    'boringssl_git': 'https://boringssl.googlesource.com',
>    # Three lines of non-changing comments so that
>    # the commit queue can handle CLs rolling swarming_client
> @@ -23,7 +23,7 @@
>    # Three lines of non-changing comments so that
>    # the commit queue can handle CLs rolling catapult
>    # and whatever else without interference from each other.
> -  'catapult_revision': 'bdff8501d71be9e9e710f3effa09a5c3a7acaa6a',
> +  'catapult_revision': '45d20f29a9ac09db8e197637ff975b0c9fbe01b3',
>    # Three lines of non-changing comments so that
>    # the commit queue can handle CLs rolling libFuzzer
>    # and whatever else without interference from each other.
> @@ -33,15 +33,15 @@
>    # TODO(kjellander): Move this to be Android-only once the libevent
dependency
>    # in base/third_party/libevent is solved.
>    'src/base':
> -    Var('chromium_git') + '/chromium/src/base' + '@' +
> 'f8bde9c2733e44b612014fcb822ac6307ecd674b',
> +    Var('chromium_git') + '/chromium/src/base' + '@' +
> '990ff1f30a64bf763135a192140ad6de1f15b1ca',
>    'src/build':
>      Var('chromium_git') + '/chromium/src/build' + '@' +
> 'd1d51d33251fba7c5d4c95d78df0a479039832ea',
>    'src/buildtools':
> -    Var('chromium_git') + '/chromium/buildtools.git' + '@' +
> '1dcd1bdbe93467531a50b60dbd18860803ca7be1',
> +    Var('chromium_git') + '/chromium/buildtools.git' + '@' +
> '7f2cacbbe274ef9df2c94452e05e8702c3ae65a9',
>    'src/testing':
> -    Var('chromium_git') + '/chromium/src/testing' + '@' +
> '5b41a1d1add2f8e99391826ba2d8a635341c8904',
> +    Var('chromium_git') + '/chromium/src/testing' + '@' +
> '8a4dce9dfe8f5878d302a1eba7c66e523964f237',
>    'src/third_party':
> -    Var('chromium_git') + '/chromium/src/third_party' + '@' +
> '15594769ca4a6b46c5d104a5175b3e5afc92df59',
> +    Var('chromium_git') + '/chromium/src/third_party' + '@' +
> 'a739549138d9fc2646e24794424c097c41fed7f8',
>    'src/third_party/boringssl/src':
>     Var('boringssl_git') + '/boringssl.git' + '@' + 
Var('boringssl_revision'),
>    'src/third_party/catapult':
> @@ -74,7 +74,7 @@
>    'src/third_party/yasm/source/patched-yasm':
>      Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' +
> '7da28c6c7c6a1387217352ce02b31754deb54d2a',
>    'src/tools':
> -    Var('chromium_git') + '/chromium/src/tools' + '@' +
> '44e2f6ae792b7a122fd17f125e148b53502e5f81',
> +    Var('chromium_git') + '/chromium/src/tools' + '@' +
> '659830978fa3fa10aba0d57cfd67c3a01271d527',
>    'src/tools/gyp':
>      Var('chromium_git') + '/external/gyp.git' + '@' +
> 'eb296f67da078ec01f5e3a9ea9cdc6d26d680161',
>     'src/tools/swarming_client':
> @@ -116,7 +116,7 @@
>    },
>    'ios': {
>      'src/ios':
> -      Var('chromium_git') + '/chromium/src/ios' + '@' +
> 'c7dda527c50f42ea196e08f5eda0c56de44c1248',
> +      Var('chromium_git') + '/chromium/src/ios' + '@' +
> '14a5caf272c369309519f3698889a751f016c8f6',
>    },
>    'unix': {
>      'src/third_party/lss':

Wrong CL to revert. Will revert https://codereview.webrtc.org/2961953002/
instead.

Powered by Google App Engine
This is Rietveld 408576698