Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
What is the difference between
cd trunk
svn merge -r<revision where branch was cut>:<revision of trunk> svn://path/to/branch/branchName
and
cd trunk
svn merge svn://path/to/branch/branchName
Exactly nothing.
Since SVN 1.5 svn will retrieve revisions based on its merge tracking feature. So if you do not give a revision it figures out from which revision you created the branch and will start on this revision unil current HEAD revision.
Note: If you issue this command twice, the second time it will not merge again, as each revision is already tracked as merged.