commit 19e667cbd4d28ec81f55d3978aa605b92cdc1a10
author dpranke <dpranke@chromium.org> Mon Aug 17 22:11:29 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 18 05:12:04 2015 +0000
tree a219d61626eb81a1f5d3a04ff90ce4ff14e72da2
parent b181adbdadbad825f046773e968a19be18606664

Fix various stray bugs in the GN auto-roller, and repair the DEPS file.

The GN auto-roller script had two bugs in it, one of which was
damaging the DEPS file: when we updated the buildtools revision,
we would drop a newline and end up concatenating the following line.
A second roll would then drop that concatenated line, shrinking the
file, and so one. This was bad.

Secondly, the auto-roller would leave buildtools/ checked out on a
branch that had been merged into origin/master; this might cause
merge conflicts and confusion down the road.

R=thakis@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1289233003

Cr-Original-Commit-Position: refs/heads/master@{#343804}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7a694fe11fb4602ddd56edfa34a1b48f26049f63