| commit | 502f874b70f5bb7cc2fc25ab28cfc5372a012479 | [log] [tgz] |
|---|---|---|
| author | Stephen Li <stephenli@google.com> | Tue May 23 15:58:03 2017 -0700 |
| committer | Stephen Li <stephenli@google.com> | Tue May 23 15:58:03 2017 -0700 |
| tree | ae231492075a460d0c07c5f07b631c5cfe2bcd69 | |
| parent | aba35b095920742aab3361df10cf88a46b17a397 [diff] |
Deflake testDownstreamMergeConflict by abandoning changes correctly. Previously, we had a race condition where we would abandon all downstream changes of the initial, source change. Instead, we should only abandon the obsolete change that hit the merge conflict and all changes downstream of it. Change-Id: I1e5066ec7c48ba9631d0ab8e07862ddfa1cd24cb