将 svn 文件夹恢复到以前的版本 [英] Revert a svn folder to a previous revision

问题描述

要将 SVN 中的特定文件夹恢复到以前的状态，我目前使用以下方法:

To revert a particular folder in SVN to its previous state I currently use the following:

svn rm folder
svn commit -m 'removed folder to revert to previous version'
svn co http://pathto/repo/folder@268
cd folder
rm -rf .svn //recursively if many folders
svn add folder
svn commit -am 'reverted to the previous version'

对于应该是相当常见的用例来说似乎太麻烦了.我一定是做错了.你还能怎么做?

Seems too much trouble for what should be a fairly common use case. I must be doing it wrong. How else can you do it?

推荐答案

为什么不使用 svn merge?

假设您想从当前 HEAD(上次提交)版本恢复到修订版 268:

Assuming you want to revert from current HEAD (last committed) version to revision 268:

cd folder
svn up
svn merge -r HEAD:268 .

然后手动解决任何冲突(如果没有本地更改，则应该没有任何冲突)并且:

Then resolve any conflicts manually (there should be nothing if there is no local change) and:

svn commit -m "- reverted to revision 268"

要恢复单个更改(例如在修订版 666 中所做的更改):

To revert single change (e.g. made in revision 666):

cd folder
svn merge -c -666 .

要恢复本地更改(尚未提交):

To revert local changes (not committed yet):

cd folder
svn revert -R .

这篇关于将 svn 文件夹恢复到以前的版本的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！