Hi I am trying to merge one single revision using CL in SVN using this command:
svn merge -r 5454 URL
but I am getting the following error
svn: Second revision required
My revision is not the latest revision but buried about 90 revisions from the latest update. Any thoughts on what I am doing wrong?
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.
A synchronization merge is appropriate when synchronization of a branch with its ancestor is required. For example, feature branches should be periodically synchronized with their ancestor to minimize integration risk. Synchronization should be performed as frequently as possible.
When you need to provide a diff (including diff
and merge
commands), you can use either -rSTART:FINISH
(-r5453:5454
in your case) or -cSINGLE
(-c5454
in your case).
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