Issue 432017: gclient: handle case for upstream has rebased

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 432017: gclient: handle case for upstream has rebased (Closed)

Created:
11 years ago by Mandeep Singh Baines

Modified:
9 years, 7 months ago

Reviewers:
M-A Ruel, djmm

CC:
chromium-reviews_googlegroups.com

Visibility:
Public.

Description

gclient: handle case for upstream has rebased gclient sync will potentially fail if the upstream git tree has been rebased. This CL fixes this by using rebase --onto to only rebase our local changes. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=33011

Patch Set 1 #

Patch Set 2 : Fix bug. #

Patch Set 3 : Fixed some corner cases. #

Created: 11 years ago

		Unified diffs	Side-by-side diffs	Stats (+5 lines, -2 lines)
	M	gclient_scm.py	View	1 chunk	+5 lines, -2 lines	0 comments

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

totally rubberstamp lgtm

Expand Messages | Collapse Messages