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
Consider these steps:
- Create a svn branch
- Add several new files to the branch
- Reintegrate the branch into a local copy of the trunk
- 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