This seems to be a frequently asked question, but I think my version of the question is unique. I'm fairly comfortable with merging at this point but while doing something new today I got this message and I want to understand why.
I setup a new branch off my trunk to work on an experimental feature. Basically:
svn cp http://trunk http://newbranch
As part of the work that I have been doing on the new branch, I have been renaming some files.
Now I am merging the on-going work on the trunk into my new branch so that I can stay up with the mainline development.
Any file which was modified on the trunk and simultaneously renamed on the branch gives me a "Skipped missing target" message.
Is this because I did something wrong, or is this something that subversion can't do yet?
I realize that it would be complicated for subversion to track changes across a branch when the file was renamed -- difficult but not impossible. So my hypothesis is that subversion is skipping them because it thinks the file was deleted, even though it was actually moved. Am I right??
Thanks for any info---
Last updated