)]}' { "commit": "9682a824f056015107204afd4c1c7107486b36cc", "tree": "f57c82f45fd14941fbb1ab059a1641b806dbae67", "parents": [ "84ce56f9bd175c7d7ed13da23b6a022f5437893a", "9eaec5b8f010c805fd8e77216a1ec67eb20b1466" ], "author": { "name": "Avery Pennarun", "email": "apenwarr@gmail.com", "time": "Wed Aug 29 15:25:28 2012 -0400" }, "committer": { "name": "Avery Pennarun", "email": "apenwarr@gmail.com", "time": "Wed Aug 29 16:16:19 2012 -0400" }, "message": "Merge tag \u0027n0.5.10\u0027 of /tmp/ffmpeg into ap\n\n(Conflicts resolved exactly how jkardatzke did it separately, so the\nresulting tree is identical.)\n\nThere are quite a few divergences between our tree and upstream n0.5.10 that\ndon\u0027t look intentional (especially in documentation files as opposed to\ncode). To reduce merge conflicts in the future, it would be helpful to\nfirst minimize the spurious differences before attemping a merge. You can\ngo through them like this:\n\n git checkout -p origin/upstream\n\n(where \u0027origin\u0027 is the name of the git server you\u0027re using). git will go\nthrough each place we differ from upstream and ask if you want to revert it.\nYou can pick the parts you want to revert and commit the result. git will\nunderstand the result and avoid conflicts in future merges automatically.\n\nNote that the 0.5.x branch of ffmpeg has also diverged from mainstream\ndevelopment. To merge the next 0.5.x release:\n\n\tgit checkout origin/upstream\n\tgit fetch git://source.ffmpeg.org/ffmpeg.git n0.5.x\n\tgit merge FETCH_HEAD\n\t # should be no conflicts\n\tgit push origin HEAD:upstream\n\n\tgit checkout master\n\tgit merge upstream\n\t # resolve conflicts\n\tgit commit\n\tgit push origin HEAD:refs/for/master\n\nTo switch to the mainline branch is slightly different since ffmpeg itself\nhas conflicts between 0.5.x and mainline. We can assume everything in 0.5.x\nis already in their mainline, though, so:\n\tgit checkout origin/upstream\n\tgit fetch git://source.ffmpeg.org/ffmpeg.git HEAD\n\tgit merge -s theirs FETCH_HEAD\n\t # should be no conflicts since \"-s theirs\" always picks\n\t # the new upstream version\n\tgit push origin HEAD:upstream\n\n\t...then \u0027git checkout master\u0027 etc as above.\n\n(Leaving these notes here in the commit log for the benefit of whoever\nsearches for it when doing the next merge :))\n\n* tag \u0027n0.5.10\u0027 of /tmp/ffmpeg:\n update for 0.5.10\n wmv1: check that the input buffer is large enough\n truemotion1: Check index, fix out of array read\n Release notes for 0.5.9\n ...\n\nChange-Id: If650704cafe58abb119cffc52dab093e42cbf5af\n", "tree_diff": [] }