Issue 101283002: SyncFS: Fix conflict resolver for multiple parents

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 101283002: SyncFS: Fix conflict resolver for multiple parents (Closed)

Created:
7 years ago by nhiroki

Modified:
7 years ago

Reviewers:
kinuko, tzik

CC:
chromium-reviews, kinuko+watch, nhiroki, tzik

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

SyncFS: Fix conflict resolver for multiple parents BUG=240165 TEST=unit_tests --gtest_filter=ConflictResolverTest.* Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238373

Created: 7 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+81 lines, -2 lines)			Patch
	M	chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc	View		2 chunks	+3 lines, -1 line	0 comments	Download
	M	chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc	View		2 chunks	+78 lines, -1 line	0 comments	Download

Total messages: 5 (0 generated)

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/nhiroki@chromium.org/101283002/1

7 years ago (2013-12-03 08:20:14 UTC) #4

Message was sent while issue was closed.

Change committed as 238373