RE: Problem with diff after merging

2010-11-19 Thread Jahn Otto Andersen
t: Re: Problem with diff after merging Doesn't 'svn diff' say something to the effect of "A file with name was added"? There is also: % $svn h diff | grep add --show-copies-as-adds [--sca] : don't diff copied or moved files with their source ... but I think it

Re: Problem with diff after merging

2010-11-15 Thread Daniel Shahaf
Doesn't 'svn diff' say something to the effect of "A file with name was added"? There is also: % $svn h diff | grep add --show-copies-as-adds [--sca] : don't diff copied or moved files with their source ... but I think it's only in 1.7. Jahn Otto Andersen wrote on Mon, Nov 15, 2010 at 10:2

Problem with diff after merging

2010-11-15 Thread Jahn Otto Andersen
I am using a code review tool called ReviewBoard to do code reviews. This tool uses svn diff to report the changes between BASE and work area. I'm having problems when working in a branch and then merging into trunk. This problem seems to be caused by the diff generated by svn diff. What I