Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How to merge one single revision using Command Line

Tags:

svn

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?

like image 234
Zach Smith Avatar asked Jun 02 '10 13:06

Zach Smith


People also ask

How do I merge two SVN revisions?

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).

How do you merge a specific commit from one branch to another SVN?

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.

What is Sync merge?

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.


1 Answers

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).

like image 66
wRAR Avatar answered Sep 28 '22 06:09

wRAR