| commit | 755f4bc6c59ebc762a6b92c53c6011243be344b4 | [log] [tgz] |
|---|---|---|
| author | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | Thu Jan 14 12:43:13 2016 +0100 |
| committer | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | Mon Feb 01 10:18:44 2016 +0100 |
| tree | fc8ddcfb5e2402e3df6586e09b950c4079b45671 | |
| parent | ae6fc1e8a3d7de7a5b1135476adcfda258c77627 [diff] |
Scalable conflict detector New algorithm searches for conflicts only where it makes sense, which is basically in the same match generally, except for ReferenceChanges, for which an index on values is used. Consequently, the algorithm shrinks from O(n²) to O(n) or maybe O(n log(n)). Change-Id: I021d90dd7a0429116edc071759ee65f2fa06b56c Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
