Issue 10913193: Rebase explicitly origin/master instead of guessing from the remote.

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 10913193: Rebase explicitly origin/master instead of guessing from the remote. (Closed)

Created:
8 years, 3 months ago by M-A Ruel

Modified:
8 years, 3 months ago

Reviewers:
cmp, Roger McFarlane (Chromium)

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

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

Visibility:
Public.

More Reviews

Description

Rebase explicitly origin/master instead of guessing from the remote. Not sure this code worked. R=cmp@chromium.org BUG= Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=156059

Patch Set 1 #

Created: 8 years, 3 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+1 line, -1 line)			Patch
	M	update_depot_tools.bat	View		1 chunk	+1 line, -1 line	0 comments	Download

Messages

Total messages: 5 (0 generated)

Expand Messages | Collapse Messages

cmp

lgtm, this makes update_depot_tools.bat do the same thing as the (updated) update_depot_tools, thanks

8 years, 3 months ago (2012-09-11 17:46:45 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/10913193/1

8 years, 3 months ago (2012-09-11 17:46:58 UTC) #3

commit-bot: I haz the power

Failed to apply patch for depot_tools/update_depot_tools.bat: While running patch -p1 --forward --force; patching file depot_tools/update_depot_tools.bat ...

8 years, 3 months ago (2012-09-11 17:47:01 UTC) #4

Roger McFarlane (Chromium)

8 years, 3 months ago (2012-09-13 18:27:27 UTC) #5

Hmm... I think this change breaks the bootstrapping from the zip file.

It's updating the batch file as it's being executed, which looks like it
confuses cmd.exe.

This (sort-of) works in the python script because you're executing the
byte-compiled "version" of the file and changing the source.

Time to push a new zip file?

Expand Messages | Collapse Messages