Issue 10758011: Set default for branch.autosetupmerge. This avoids problems with git-cl-upload

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 10758011: Set default for branch.autosetupmerge. This avoids problems with git-cl-upload (Closed)

Created:
8 years, 5 months ago by szager1

Modified:
8 years, 5 months ago

Reviewers:
cmp, Nicolas Sylvain, nsylvain, M-A Ruel

CC:
chromium-reviews, Dirk Pranke, cmp+cc_chromium.org, M-A Ruel

Base URL:
svn://svn.chromium.org/chrome/trunk/tools/depot_tools/

Visibility:
Public.

More Reviews

Description

Set default for branch.autosetupmerge. This avoids problems with git-cl-upload picking the wrong upstream branch. BUG=136086 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=145791

Patch Set 1 #

Total comments: 1

Created: 8 years, 5 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+10 lines, -6 lines)			Patch
	M	gclient_scm.py	View		1 chunk	+10 lines, -6 lines	1 comment	Download

Messages

Total messages: 6 (0 generated)

Expand Messages | Collapse Messages

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/szager@chromium.org/10758011/1

8 years, 5 months ago (2012-07-09 23:38:05 UTC) #4

M-A Ruel

8 years, 5 months ago (2012-07-10 14:18:43 UTC) #6

https://chromiumcodereview.appspot.com/10758011/diff/1/gclient_scm.py
File gclient_scm.py (right):

https://chromiumcodereview.appspot.com/10758011/diff/1/gclient_scm.py#newcode197
gclient_scm.py:197: def UpdateSubmoduleConfig(self):
Why not a for loop at that point? I'd be shorter and more readable. I don't mind
that much.

Expand Messages | Collapse Messages