RE: Problem with diff after merging

2010-11-19 Thread Jahn Otto Andersen
Nope, it just says it was merged. Perhaps --show-copies-as-adds will do the trick, but it's not available in 1.6 :( -Original Message- From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] Sent: 15. november 2010 16:55 To: Jahn Otto Andersen Cc: users@subversion.apache.org Subject: Re

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