Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3050)

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

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/sessions/ordered_commit_set.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sessions/ordered_commit_set.cc
diff --git a/chrome/browser/sync/sessions/ordered_commit_set.cc b/chrome/browser/sync/sessions/ordered_commit_set.cc
index d70049421e1ff3472c0017cf51d741271b7a72c3..3700e1c3eda62b81d58c6c16ae3cabfb96ddb072 100644
--- a/chrome/browser/sync/sessions/ordered_commit_set.cc
+++ b/chrome/browser/sync/sessions/ordered_commit_set.cc
@@ -31,6 +31,13 @@ void OrderedCommitSet::AddCommitItem(const int64 metahandle,
}
}
+void OrderedCommitSet::Append(const OrderedCommitSet& other) {
+ for (int i = 0; i < other.Size(); ++i) {
+ CommitItem item = other.GetCommitItemAt(i);
+ AddCommitItem(item.meta, item.id, item.group);
+ }
+}
+
void OrderedCommitSet::AppendReverse(const OrderedCommitSet& other) {
for (int i = other.Size() - 1; i >= 0; i--) {
CommitItem item = other.GetCommitItemAt(i);
« no previous file with comments | « chrome/browser/sync/sessions/ordered_commit_set.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698