| commit | f123da817a0ad58893dec05087fe290cf436098f | [log] [tgz] |
|---|---|---|
| author | Raja Daoud <rdaoud@google.com> | Thu Jun 12 12:03:21 2014 -0700 |
| committer | Raja Daoud <rdaoud@google.com> | Thu Jun 12 12:03:27 2014 -0700 |
| tree | 1c0c7b947f9299a708af65ae803caebba6d5d22e | |
| parent | b87e856670426b0447ddd942119f8d092129566c [diff] |
Allow adding more parents to a DAG node. This is used to track conflict resolutions that select (bless) an existing object version instead of creating a new one. Capturing this info allows Sync to avoid a type of false conflict. Change-Id: Ice6b1d53c37f1212aebfcf7c5add7d8fecb88f9f