On 8/19/2010 11:57 AM, Ryan Schmidt wrote:
> On Aug 19, 2010, at 10:49, David Aldrich wrote:
>
>> I have now read the cherrypicking section. I think the point to note is that merge is to do with changes, e.g. merge in the changes made in r1823. I was looking to bring a specific version of a file. So, with merge, I would need to work out which range of changes to apply.
>
> You can do that. To replace myfile.txt in the tag mytag with the older revision 123, you could do:
>
> svn rm $URL/tag/mytag/myfile.txt
> svn cp $URL/trunk/myfile.txt_at_123 $URL/tag/mytag
>
> Or instead of using URLs you could work in a working copy of the tag, then commit the tag; this is probably better so you can test your changes in the tag first before committing everything:
>
> svn co $URL/tag/mytag
> cd mytag
> svn rm myfile.txt
> svn cp $URL/trunk/myfile.txt_at_123 .
> svn ci
While subversion itself will let you commit to existing tags, by
convention most people don't and some may have pre-commit hooks that
prevent it. To follow normal conventions you would copy the old tag to
a branch, modify it there, then copy the corrected branch version to a
tag with a different name.
--
Les Mikesell
lesmikesell_at_gmail.com
Received on 2010-08-19 21:17:14 CEST