svn merge with revision not doing what I expect

Question

Hi,

I'm trying to do an svn merge of a change from trunk onto a branch (2001). The change is in trunk on revision 614.

I've tried the following and none of them do what I want :

$svn merge

08:19 AM[~/views/2001/platform/L3/src]$svn merge -r 614:HEAD https://secreturl/trunk

But this seems to pick up a lot of changes I don't want.

When I ran : svn log -r 614 https://secreturl/trunk - I saw the checkin comment for the small subset of changes I wanted to merge. What am I missing here?

Answer 1

I think you want -r 613:HEAD. If you JUST want change 614, do -r 613:614.

Answer 2

svn log -r 614 will show you the specific 614 revision. If you want to just merge the results of r614, do this:

svn merge -r 613:614 https://secreturl/trunk

That is, merge the changes from 613 to 614.

Answer 3

svn merge -r 614:HEAD https://secreturl/trunk will merge all changes between revision 614 and HEAD. Moreover, it will take 614 as the base revision (probably not what you want happenning :)

To merge changes from a specific revision, you can use one of two methods:

$ svn merge -c 614 https://secreturl/trunk or $ svn merge -r 613:614 https://secreturl/trunk.

The first means apply changes in revision 614 only, while the second form means take all changes required to go from r613 to r614 and apply them here.

Answer 4

Good site to help you along
Link 1