Mercurial > hg > ConflictEditor
log
| age | author | description |
|---|---|---|
| Sun, 18 Sep 2011 09:37:40 +0200 | dirk | do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before. |
| Sun, 18 Sep 2011 09:35:43 +0200 | dirk | directly compare the JsonNode objects that are returned as values for a given field name. Difference needs to preserve them so that the JsonNodes can be used when merging conflict JSON documents later. |
| Sat, 17 Sep 2011 09:28:13 +0200 | dirk | toString of Difference should properly quote the values and not quote null fields. |
| Sat, 17 Sep 2011 09:22:30 +0200 | dirk | helper class for playing around with JSON |
| Sat, 17 Sep 2011 07:10:23 +0200 | dirk | better assertions |
| Sat, 17 Sep 2011 07:05:41 +0200 | dirk | implement hashCode and equals for Difference |
| Sat, 17 Sep 2011 06:55:38 +0200 | dirk | tighten up checks |