svn - 用乌龟SVN恢复

Question

如果我在 TortoiseSVN 中查看 Subversion 日志



当我选择一个修订并右键单击时，我会看到以下选项(以及其他选项):

将项目更新为修订版

恢复到此修订版

恢复此修订版的更改

有人可以解释这三个之间有什么区别吗？

我真正想做的是 暂时恢复我的工作副本 返回到存储库的选定版本。我应该选择这些选项中的哪一个？

Answer 1

您应该选择第二个选项。
当您单击此对话框中的“帮助”按钮时，您会得到以下信息:

Update item to revision

Update your working copy to the selectedrevision. Useful if you want to have your working copy reflect a timein the past, or if there have been further commits to the repositoryand you want to update your working copy one step at a time. It isbest to update a whole directory in your working copy, not just onefile, otherwise your working copy could be inconsistent.

If you want to undo an earlier change permanently, use Revert to thisrevision instead.

Revert to this revision

Revert to an earlier revision. If you havemade several changes, and then decide that you really want to go backto how things were in revision N, this is the command you need. Thechanges are undone in your working copy so this operation does notaffect the repository until you commit the changes. Note that thiswill undo all changes made after the selected revision, replacing thefile/folder with the earlier version.

If your working copy is in an unmodified state, after you perform thisaction your working copy will show as modified. If you already havelocal changes, this command will merge the undo changes into yourworking copy.

What is happening internally is that Subversion performs a reversemerge of all the changes made after the selected revision, undoing theeffect of those previous commits.

If after performing this action you decide that you want to undo theundo and get your working copy back to its previous unmodified state,you should use TortoiseSVN → Revert from within Windows Explorer,which will discard the local modifications made by this reverse mergeaction.

If you simply want to see what a file or folder looked like at anearlier revision, use Update to revision or Save revision as...instead.

Revert changes from this revision

Undo changes from which were made inthe selected revision. The changes are undone in your working copy sothis operation does not affect the repository at all! Note that thiswill undo the changes made in that revision only; it does not replaceyour working copy with the entire file at the earlier revision. Thisis very useful for undoing an earlier change when other unrelatedchanges have been made since.

If your working copy is in an unmodified state, after you perform thisaction your working copy will show as modified. If you already havelocal changes, this command will merge the undo changes into yourworking copy.

What is happening internally is that Subversion performs a reversemerge of that one revision, undoing its effect from a previous commit.

You can undo the undo as described above in Revert to this revision.