Single file merge in Subversion

Viewed 49833

I'm using Subversion 1.5 and have a single file in a branch that I want to merge into another branch. When I do a svn merge http://path/to/file I get an error,

Cannot replace a directory from with .

Does this just mean that Subversion can't do this?

5 Answers

Try specifying the path to the local file as well.

For example,

svn merge -r1234:1235 svn://your_svn_url/to/file ./local_file

I think you need to do a

svn merge http://server/repos/path/to -r <REV>

where <REV> is the revision where the file was added. That way merge information is recorded (in case of a Subversion 1.5 or higher repository).

I think your best best is an svn copy from one branch to the other.

Related