Subversion Merging with New Files
Posted on 2009-02-23
I've got a Subversion setup with trunk and branches. If I add a brand-new file to a branch and want to use svn merge to pull the files back into the trunk:
svn merge -r1234:HEAD svn://path/to/repo/branches/mybranch/newfile.jpg /working/copy/trunk/newfile.jpg
I get this:
svn: Use --force to override this restriction
svn: '/working/copy/trunk/newfile.jpg' is not under version control
Now, newfile.jpg doesn't exist locally. I just want to use svn merge to pull it from the branch into the trunk into the right spot.
I -could- use svn copy, but I really need to do files 1-by-1, and svn copy makes changes to the repository, not to the working copy, which also increments the revision number, too. My goal is to bring over a certain set of adds/updates/deletes from the branch, and then commit them to the trunk with one commit.
Where am I going wrong?