| commit | d81082a7c02cf7fc0cd369f66aa9567d629907b7 | [log] [tgz] |
|---|---|---|
| author | Nelly Vouzoukidou <nellyv@google.com> | Mon Feb 18 13:30:22 2019 +0100 |
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | Mon Feb 18 20:46:12 2019 +0000 |
| tree | 5cdcdd17bd9dd906281d4a3a8094eb4efdb4a54d | |
| parent | dc1cb9e2d25c17d656005631985c578c33c8e83d [diff] |
[ledger] Maintain the order of insertions/deletions in merge journals. Test: MergingIntegrationTest.CustomConflictResolutionMergeValuesOrder LE-691 #done ConflictResolverClient was putting all deletions before insertions in the merge journal. After this CL, operations in the journal match the order of merged_values given to the resolver. Change-Id: I0e4452165e0845f87cafd2117513d294a7cc1af8
Pink + Purple == Fuchsia (a new operating system)
Fuchsia is a modular, capability-based operating system. Fuchsia runs on modern 64-bit Intel and ARM processors.
Fuchsia is an open source project with a code of conduct that we expect everyone who interacts with the project to respect.
See Getting Started.
See the documentation.