tests/gclient_scm_test.py - Issue 15421005: Don't "hang" gclient if fast-forward is not possible.

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

Unified Diff: tests/gclient_scm_test.py

Issue 15421005: Don't "hang" gclient if fast-forward is not possible. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Generalizing. Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: tests/gclient_scm_test.py

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py

index 3f1ff3b02772c607edcdfaee46369faa717a3807..babd133fbc51a702501c883d2f84bb50d947518c 100755

--- a/tests/gclient_scm_test.py

+++ b/tests/gclient_scm_test.py

@@ -684,6 +684,7 @@ class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils,

self.reset = False

self.nohooks = False

self.merge = False

+ self.jobs = 1

self.delete_unversioned_trees = False

sample_git_import = """blob

« no previous file with comments | « gclient_scm.py ('k') | no next file » | no next file with comments »