Using svn diff after reintegration of branch

Posted by manu08 on Stack Overflow See other posts from Stack Overflow or by manu08
Published on 2011-03-15T15:40:10Z Indexed on 2011/03/15 16:09 UTC
Read the original article Hit count: 277

Filed under:
|
|

Consider these steps:

  1. Create a svn branch
  2. Add several new files to the branch
  3. Reintegrate the branch into a local copy of the trunk
  4. Run svn diff on the local trunk copy

The issue is that svn diff doesn't detect any changes. It ignores the new files because they are marked as copies of the branch. So when it diffs them against the head of the branch, no differences are found.

How do I force svn diff to pick up these changes?

© Stack Overflow or respective owner

Related posts about svn

Related posts about branch