checkout.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: checkout.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: checkout.py

diff --git a/checkout.py b/checkout.py

index 5dbb375caad2f0dd0e37fff83f862d8e57a3218b..8d5cccecdc6ef1bfe1817aa3a54a2cebff1cf2ef 100644

--- a/checkout.py

+++ b/checkout.py

@@ -676,7 +676,7 @@ class GitCheckout(CheckoutBase):

else:

# No need to do anything special with p.is_new or if not

# p.diff_hunks. git apply manages all that already.

- cmd = ['apply', '--index', '-p%s' % p.patchlevel]

+ cmd = ['apply', '--index', '-3', '-p%s' % p.patchlevel]

if verbose:

cmd.append('--verbose')

stdout.append(self._check_output_git(cmd, stdin=p.get(True)))

« no previous file with comments | « no previous file | tests/checkout_test.py » ('j') | no next file with comments »