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 Doesn't 'svn diff' say something to the effect of "A file with <this> 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:20:00 +0100: > 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 do: > > 1. Create a new branch based on trunk using TortoiseSVN's "branch" function > 2. Commit several changes into the branch, including creating new files > 3. Reintegrate branch into trunk using TortoiseSVN's "reintegrate branch" > function. > 4. Generate the diff using svn diff and use this for the code review > > The problem is: > > The diff that is created by svn diff does not contain the new file. The diff > file contains the following lines (given that the new file is named > NewFile.cs): > > > > -------------------- > Property changes on: NewFile.cs > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /blabla/branches/mybranch/NewFile.cs:r11226-11336 > --------------------- > > > > It seems like the diff contains information about the fact that the new file > is being merged into trunk from the branch, but it doesn't contain the > actual lines in the new file. As a result, the review request in ReviewBoard > doesn't contain NewFile.cs at all. > > Is there any way I can make svn diff include the new lines in the new file? > > >
