Ethan Glasser-Camp
2b966460f6
Bug 1351678: Handle resolved conflicts correctly, r=kmag
...
The elements of the SyncResultObject#conflicts field are {local,
remote} pairs. However, the elements of the SyncResultObject#resolved
field are just the resolutions, and trying to access "local" and
"remote" fields of those resolutions causes a crash. Add a test that
demonstrates the error, and then fix it.
MozReview-Commit-ID: LF0NBw5VKBC
2017-04-20 13:44:46 -04:00
..
2017-04-06 15:20:24 -07:00
2017-03-20 12:36:37 +01:00
2017-01-22 16:23:33 -08:00
2017-03-06 17:15:40 -08:00
2016-09-08 14:23:12 -04:00
2017-03-06 17:15:40 -08:00
2016-11-07 21:03:14 -08:00
2016-11-07 21:03:14 -08:00
2016-11-07 21:03:14 -08:00
2017-01-26 11:27:31 -08:00
2017-03-31 19:36:00 -07:00
2016-11-22 12:07:59 -08:00
2017-04-06 15:20:24 -07:00
2017-03-06 17:15:40 -08:00
2017-04-07 13:39:06 -07:00
2016-12-17 18:41:02 +01:00
2016-11-07 21:03:14 -08:00
2016-11-07 21:03:14 -08:00
2016-11-07 21:03:14 -08:00
2017-02-10 21:06:55 -08:00
2017-04-14 21:51:39 +02:00
2016-11-07 21:03:14 -08:00
2017-03-07 23:41:57 -08:00
2017-03-07 23:41:57 -08:00
2017-03-06 17:15:40 -08:00
2017-03-06 17:15:40 -08:00
2017-01-26 11:27:31 -08:00
2017-04-14 21:51:39 +02:00
2017-02-11 13:28:18 -08:00
2017-04-14 21:51:39 +02:00
2017-04-14 21:51:39 +02:00
2017-03-07 14:16:19 -05:00
2017-01-11 12:08:14 -08:00
2017-02-10 21:06:55 -08:00
2017-04-14 23:39:22 +02:00
2017-02-23 09:45:37 -05:00
2017-03-07 23:41:57 -08:00
2017-02-23 09:45:37 -05:00
2016-09-30 22:42:28 +02:00
2016-11-07 21:03:14 -08:00
2017-03-06 17:15:40 -08:00
2017-03-13 05:55:52 +01:00
2016-11-07 22:04:49 -08:00
2016-11-07 22:04:49 -08:00
2016-11-07 22:04:49 -08:00
2017-01-06 12:09:28 -05:00
2017-02-10 21:06:55 -08:00
2017-02-10 21:06:55 -08:00
2017-03-12 19:20:10 -07:00
2017-02-10 21:06:55 -08:00
2017-01-10 22:00:33 +01:00
2017-03-08 09:16:01 -08:00
2017-02-13 15:06:02 -05:00
2017-04-20 13:44:46 -04:00
2017-04-14 21:51:39 +02:00
2017-04-07 13:39:06 -07:00
2016-10-21 10:03:51 -07:00
2017-04-14 21:51:39 +02:00
2017-01-22 16:23:33 -08:00
2017-03-06 17:04:46 -05:00
2017-04-06 15:20:24 -07:00
2017-03-06 17:15:40 -08:00
2017-04-16 08:32:59 -07:00