Menu
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?
510
And when you're completely finished with your branch, your entire set of branch changes can be copied back into the trunk. In Subversion terminology, the general act of replicating changes from one branch to another is called merging, and it is performed using various invocations of the svn merge subcommand.
To merge a range of revisions, use svn merge -r start:end from to where start and end are revision IDs. This will merge all revisions starting at start+1 up to and INCLUDING end . Note: it will NOT include the first revision (ex: -r3:45 will merge 4 through 45).
Have a local checkout of the branch to which you want to merge a range of revisions from a source branch. By default, "Merge a range of revisions" is clicked. Click Test Merge to check if it merges desired revisions/files.
Try specifying the path to the local file as well.
For example,
svn merge -r1234:1235 svn://your_svn_url/to/file ./local_file If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
