How do I update my working copy of SVN to changes from one specific version and not include previous versions?

Using Subversion, is there a way to merge changes from one specific revision in the trunk? Basically I have a lot of changes that have been made, but I only need to update my working copy with the latest version and not all the others.

Would I do some kind of merge?

+2


source to share


3 answers


I think you are looking for " cherrypicking ", yes it is a case of merging some revisions back into the trunk.



If you have a GUI client such as TortoiseSVN, the merge command will guide you through the procedure (select Merge a range of revisions

).

+6


source


Assuming you mean merging a specific revision into a branch in the trunk ...

If you are using TortoiseSVN, you can do:
Right Click → TortoiseSVN → Merge ...
Select Merge Series of Changes
Enter a specific version number in the Change Range to Merge text box



If you are not using turtle, you can do the same with the command line svn "merge -r".

+3


source


The trunk and the working copy are two different things: I take it from this that the trunk contains the fixes you want and some you don't want and that you don't have branches.

One thing to do is detach from the torso at the point from which your current working copy is working. Then merge the one revision you want into that branch and detach the branch. When you're ready, drain back into the trunk.

+1


source







All Articles