[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Problem with diff after merging

From: Jahn Otto Andersen <jahnotto.andersen_at_setred.com>
Date: Mon, 15 Nov 2010 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"
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


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?

Received on 2010-11-15 10:23:53 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.