chrome/browser/sync/sessions/ordered_commit_set.h - Issue 8922015: [Sync] Don't commit items with predecessors/parents in 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

Unified Diff: chrome/browser/sync/sessions/ordered_commit_set.h

Issue 8922015: [Sync] Don't commit items with predecessors/parents in conflict. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments + rebase Created 8 years, 10 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:

Index: chrome/browser/sync/sessions/ordered_commit_set.h

diff --git a/chrome/browser/sync/sessions/ordered_commit_set.h b/chrome/browser/sync/sessions/ordered_commit_set.h

index bce2246cdea3d66a8efa2a07f3ebb6eba5f220f7..0cff26d76f01c652881e304da433ce7a2f2899bc 100644

--- a/chrome/browser/sync/sessions/ordered_commit_set.h

+++ b/chrome/browser/sync/sessions/ordered_commit_set.h

@@ -76,6 +76,7 @@ class OrderedCommitSet {

// BOOKMARKS.

bool HasBookmarkCommitId() const;

+ void Append(const OrderedCommitSet& other);

void AppendReverse(const OrderedCommitSet& other);

void Truncate(size_t max_size);