tests/checkout_test.py - Issue 577203002: Use three-way merge when applying Git patches.

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/checkout_test.py

Issue 577203002: Use three-way merge when applying Git patches. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Fix test Created 6 years, 3 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/checkout_test.py

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

index d07f15ac7a80e0827d134a1843535c73b8d8bd2d..e18db0a7cdbf286cba33a5c319f80d48da296cd9 100755

--- a/tests/checkout_test.py

+++ b/tests/checkout_test.py

@@ -457,8 +457,8 @@ class GitCheckout(GitBaseTest):

def testException(self):

self._check_exception(

self._get_co(None),

- 'While running git apply --index -p1;\n fatal: corrupt patch at line '

- '12\n')

+ 'While running git apply --index -3 -p1;\n fatal: corrupt patch at '

+ 'line 12\n')

def testProcess(self):

self._test_process(self._get_co)

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