Comment #3 on issue 2494 by elliot.w...@gmail.com: manually uploaded git diff-tree --cc produce 'diff file is empty'
http://code.google.com/p/reviewboard/issues/detail?id=2494
e.g.: wolke:~$ mkdir /tmp/a; cd /tmp/a wolke:/tmp/a$ git init Initialized empty Git repository in /tmp/a/.git/ wolke:/tmp/a$ touch a wolke:/tmp/a$ git add a wolke:/tmp/a$ git commit -m 'initial commit' [master (root-commit) 4b17940] initial commit 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 a wolke:/tmp/a$ git branch feature wolke:/tmp/a$ echo stable-change >> a wolke:/tmp/a$ git add a wolke:/tmp/a$ git ci -m 'added a stable commit' [master fc720f4] added a stable commit 1 files changed, 1 insertions(+), 0 deletions(-) wolke:/tmp/a$ git checkout feature Switched to branch 'feature' wolke:/tmp/a$ echo unstable-change >> a wolke:/tmp/a$ git add a wolke:/tmp/a$ git ci -m 'added an unstable commit' [feature 3332df1] added an unstable commit 1 files changed, 1 insertions(+), 0 deletions(-) wolke:/tmp/a$ git checkout master Switched to branch 'master' wolke:/tmp/a$ git merge feature Auto-merging a CONFLICT (content): Merge conflict in a Automatic merge failed; fix conflicts and then commit the result. wolke:/tmp/a$ echo resolution-of-stable-and-unstable-change > a wolke:/tmp/a$ git add a wolke:/tmp/a$ git commit -m 'Merged branch 'feature', fixed conflict on a' [master 799525f] Merge branch 'feature' wolke:/tmp/a$ git show HEAD --format=format:'' diff --cc a index eb0b6a2,caf0188..13303c2 --- a/a +++ b/a @@@ -1,1 -1,1 +1,1 @@@ - stable change -unstable-change ++union-of-stable-and-unstable-change -- You received this message because you are subscribed to the Google Groups "reviewboard-issues" group. To post to this group, send email to reviewboard-issues@googlegroups.com. To unsubscribe from this group, send email to reviewboard-issues+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/reviewboard-issues?hl=en.
