Mercurial > hg > ConflictEditor

view conflict-editor/src/test/resources/single-conflict.json @ 31:56cf93ee85f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
author dirk
date Tue, 20 Sep 2011 17:00:45 +0200
parents 6f11757c4811
children
line wrap: on
line source

{
  "total_rows": 24,
  "offset": 0,
  "rows": [
    {
      "id": "54620eb9a46d495eac294a3bd508db39",
      "key": {
        "_id": "54620eb9a46d495eac294a3bd508db39",
        "_rev": "24-223d00d8f77d78a2911cbb265f5025eb",
        "rss_url": "http://feeds.feedburner.com/muleblog\n",
        "always_open_in_browser": false,
        "auto_load_entry_link": false,
        "title": "From the Mule\u2019s Mouth",
        "doctype": "feed",
        "update_interval": 60,
        "next_update": "2011-09-12T03:20:06Z",
        "_conflicts": [
          "16-7f27b886bf38e4f9e543bee0ddf85758"
        ]
      },
      "value": [
        "16-7f27b886bf38e4f9e543bee0ddf85758"
      ]
    }
  ]
}