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

Issue 26280004: Remove --milestone to force engineers to double-check with TPMs for branch number. (Closed)

Created:
7 years, 2 months ago by Dan Beam
Modified:
7 years, 1 month ago
CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Visibility:
Public.

Description

Remove --milestone to force engineers to double-check with TPMs for branch number. BUG=304943 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=227348

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4 lines, -73 lines) Patch
M drover.py View 6 chunks +4 lines, -73 lines 0 comments Download

Messages

Total messages: 8 (0 generated)
Marc-Antoine Ruel (Google)
rubberstamp lgtm
7 years, 2 months ago (2013-10-07 21:18:36 UTC) #1
laforge
lgtm
7 years, 2 months ago (2013-10-07 21:21:52 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dbeam@chromium.org/26280004/1
7 years, 2 months ago (2013-10-07 21:34:41 UTC) #3
commit-bot: I haz the power
Change committed as 227348
7 years, 2 months ago (2013-10-07 21:36:20 UTC) #4
ojan
Can http://www.chromium.org/developers/how-tos/drover be updated with the new best practice? Should I really be asking a ...
7 years, 1 month ago (2013-10-30 21:31:39 UTC) #5
Dan Beam
On 2013/10/30 21:31:39, ojan wrote: > Can http://www.chromium.org/developers/how-tos/drover be updated with the new > best ...
7 years, 1 month ago (2013-10-30 21:32:32 UTC) #6
jsbell
On 2013/10/30 21:32:32, Dan Beam wrote: > On 2013/10/30 21:31:39, ojan wrote: > > Can ...
7 years, 1 month ago (2013-10-30 21:36:46 UTC) #7
laforge
7 years, 1 month ago (2013-10-30 21:47:04 UTC) #8
Message was sent while issue was closed.
On 2013/10/30 21:32:32, Dan Beam wrote:
> On 2013/10/30 21:31:39, ojan wrote:
> > Can http://www.chromium.org/developers/how-tos/drover be updated with the
new
> > best practice? Should I really be asking a TPM what the branch number is?
> 
> apparently kareng@ thinks so

The problem w/ the implementation was that it would report the wrong branch, if
there were any published releases with the same major version number (e.g. 
ChromeOS didn't update their dev channel, and had last week's 31, or we didn't
increment the major version on trunk and Canary was at Major.0.Branch+1.0,
etc...).  This has been a significant problem, immediately post-branch point,
when merge requests are at their peak (i.e. pretty much the worst time for that
info to be bad).

The other problem was the it would report on branches that we didn't want
developers to touch (i.e. our so-called mini-branches that we use to cherry pick
specific fixes), developers were getting confused and merging to all of them...
which was a larger source of confusion.

Generally speaking, it's hard to programmatically/correctly determine which
branch represents the source of truth for a milestone, which force the code to
be generalized (reporting all possible branches) and was in turn causing merges
to go to incorrect locations.  

FWIW, all the merge-approval notifications that developers receive contain the
branch that we want them to merge to.  All that said... it actually might be
worthwhile to re-implement the same logic that our merge-approval bot uses to
determine the branch of truth... if one were inclined to bring this feature
back.

Powered by Google App Engine
This is Rietveld 408576698