Issue 496003: gclient: Add better error reporting and handling when there is a rebase conflict

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 496003: gclient: Add better error reporting and handling when there is a rebase conflict (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, M-A Ruel

Visibility:
Public.

Description

gclient: Add better error reporting and handling when there is a rebase conflict When a rebase generates a conflict, report an error and exit immediately. If in an existing conflict (no branch), report an error and exit immediately. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=34459

Patch Set 1 #

Created: 11 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+54 lines, -3 lines)			Patch
	M	gclient_scm.py	View		2 chunks	+30 lines, -2 lines	0 comments	Download
	M	tests/gclient_scm_test.py	View		2 chunks	+24 lines, -1 line	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

djmm

11 years ago (2009-12-12 08:53:20 UTC) #2

lgtm

On Fri, Dec 11, 2009 at 10:12 PM, <msb@chromium.org> wrote:

> Reviewers: Marc-Antoine Ruel, djmm,
>
> Description:
> gclient: Add better error reporting and handling when there is a rebase
> conflict
>
> When a rebase generates a conflict, report an error and exit immediately.
> If in an existing conflict (no branch), report an error and exit
> immediately.
>
> Please review this at http://codereview.chromium.org/496003
>
> Affected files:
>  M gclient_scm.py
>  M tests/gclient_scm_test.py
>
>
>

Expand Messages | Collapse Messages