)]}'
{
  "commit": "1829101e285cf7956d045cf7a04a8adb7f4c0109",
  "tree": "ab68a895f67489ee207b4cb340f7010d75c34bb0",
  "parents": [
    "1966133f8e82971f2e247a8579735a3b2f19301d"
  ],
  "author": {
    "name": "Rob Ward",
    "email": "robert.ward114@googlemail.com",
    "time": "Sun Feb 02 11:42:05 2014 +0000"
  },
  "committer": {
    "name": "Rob Ward",
    "email": "robert.ward114@googlemail.com",
    "time": "Tue Feb 11 18:19:04 2014 +0000"
  },
  "message": "Add error message for download -c conflicts\n\nCurrently if you run repo download -c on a change and the cherry-pick\nruns into a merge conflict a Traceback is produced:\n\nrob@rob-i5-lm ~/Programming/repo_test/repo1 $ repo download -c repo1 3/1\nFrom ssh://rob-i5-lm:29418/repo1\n * branch            refs/changes/03/3/1 -\u003e FETCH_HEAD\nerror: could not apply 0c8b474... 2\nhint: after resolving the conflicts, mark the corrected paths\nhint: with \u0027git add \u003cpaths\u003e\u0027 or \u0027git rm \u003cpaths\u003e\u0027\nhint: and commit the result with \u0027git commit\u0027\nTraceback (most recent call last):\n  File \"/home/rob/Programming/git-repo/main.py\", line 408, in \u003cmodule\u003e\n    _Main(sys.argv[1:])\n  File \"/home/rob/Programming/git-repo/main.py\", line 384, in _Main\n    result \u003d repo._Run(argv) or 0\n  File \"/home/rob/Programming/git-repo/main.py\", line 143, in _Run\n    result \u003d cmd.Execute(copts, cargs)\n  File \"/home/rob/Programming/git-repo/subcmds/download.py\", line 90, in Execute\n    project._CherryPick(dl.commit)\n  File \"/home/rob/Programming/git-repo/project.py\", line 1943, in _CherryPick\n    raise GitError(\u0027%s cherry-pick %s \u0027 % (self.name, rev))\nerror.GitError: repo1 cherry-pick 0c8b4740f876f8f8372bbaed430f02b6ba8b1898\n\nThis amount of error message is confusing to users and has the side effect\nof the git message telling you the actual issue being ignored.\n\nThis change introduces a message stating that the cherry-pick couldn\u0027t\nbe completed removing the Traceback.\n\nTo reproduce the issue create a change that causes a conflict with one currently\nin review and use repo download -c to cherry-pick the conflicting change.\n\nChange-Id: I8ddf4e0c8ad9bd04b1af5360313f67cc053f7d6a\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "471e88b5537e1f0b06ca0c59c53ab8da66ea7eaf",
      "old_mode": 33188,
      "old_path": "subcmds/download.py",
      "new_id": "098d8b430fddbf8f13e5e6d396ac7988366b85bd",
      "new_mode": 33188,
      "new_path": "subcmds/download.py"
    }
  ]
}