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

Issue 85473007: Fix unpinned version to track upstream. (Closed)

Created:
7 years ago by M-A Ruel
Modified:
7 years ago
Reviewers:
Peter Mayo
CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org, csharp, Vadim Sh.
Visibility:
Public.

Description

Fix unpinned version to track upstream. This is a serious bug, if a version is unpinned, it would become stuck at whatever a local branch 'master' may point to. This is extremely bad when a pinned dependency is unpinned on purpose, for example on a canary master. We reproduced this problem on the chromium.swarm master by setting a custom_vars swarming_revision to '', which then stopped syncing at the expected origin/master commit but instead got stuck to what happened to be a local master branch. This happens on git dependencies if the main solution is using svn. This doesn't happen on git checkouts using .DEPS.git due to bug 323233. The issue looks like: ________ running 'git reset --hard HEAD' in '/path/src/tools/swarming_client' HEAD is now at 4727bd5 Some commit Checked out revision d908a546e28d1e9f85f5690cf6c3a080f06ba711 Note that HEAD and what is checked out do not match. Also reduce the hardcoding of 'origin' by creating a variable named 'remote'. R=petermayo@chromium.org BUG=322961 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=237332

Patch Set 1 #

Patch Set 2 : fix comment #

Unified diffs Side-by-side diffs Delta from patch set Stats (+35 lines, -28 lines) Patch
M gclient_scm.py View 1 16 chunks +23 lines, -21 lines 0 comments Download
M tests/gclient_scm_test.py View 3 chunks +12 lines, -7 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
M-A Ruel
-> Peter because all American folks are slacking this week.
7 years ago (2013-11-25 20:51:23 UTC) #1
Peter Mayo
LGTM. Most of this is a good refactoring of the hard-coded origin, the default_rev seems ...
7 years ago (2013-11-25 21:04:23 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/maruel@chromium.org/85473007/20001
7 years ago (2013-11-26 14:04:45 UTC) #3
commit-bot: I haz the power
7 years ago (2013-11-26 14:06:27 UTC) #4
Message was sent while issue was closed.
Change committed as 237332

Powered by Google App Engine
This is Rietveld 408576698