什么时候 svn BASE 变得等于 HEAD [英] When does svn BASE become equal to the HEAD

问题描述

我对 svn 中的 BASE 版本有疑问.我知道这是上次运行更新时项目的原始版本，svn diff 和 status 基本上针对此版本运行.BASE 什么时候更新?运行更新时它会更新到 HEAD 吗?即使在更新过程中发生冲突，这总是正确的吗?如果发生冲突，BASE 有什么作用?它是否仍然具有我上次更新的版本(在导致冲突的最近更新之前)，或者即使存在冲突也会更新到 HEAD?
此外，当 svn commit 运行时，我假设 BASE 更新了我的本地更改，此时 BASE、HEAD 和我的本地副本都相同吗?如果提交成功.

I had a question regarding the BASE version in svn. I know it is the pristine version of an item from the last time update was run and svn diff and status basically run against this version. When does the BASE get updated? Does it get updated to the HEAD when update is run? Is this always true even if there was a conflict during update? What does BASE have incase of a conflict? Does it still have the version from my last update(before the most recent update that caused a conflict) or will it be updated to the HEAD even if there is a conflict?
Also when svn commit is run I am assuming the BASE gets updated with my local changes and at this point BASE, HEAD and my local copy all are the same? Provided the commit was successful.

推荐答案

HEAD 是存储库中的最新版本.BASE 是您从存储库中获得的最后一个修订版.成功提交或更新后，它们是相同的.

HEAD is the latest revision in the repository. BASE is the last revision you have obtained from the repository. They are the same after a successful commit or update.

当您进行更改时，您的文件与 BASE 副本不同.当您恢复时，它们会返回到匹配 BASE 修订版.当您遇到冲突时，您不会更新存储库.相反，您的文件仍被视为正在编辑"，就好像您正在进行更改一样.解决冲突后，您实质上已经决定了最终文件的外观，然后像往常一样提交它们.因此，冲突就像特殊编辑的情况.

When you make changes, your files differ from the BASE copies. When you revert, they go back to matching the BASE revision. When you get a conflict, you do not update the repository. Rather, your files are considered to still be "being edited" as if you were making changes. After you resolve conflicts, you have in essence decided what the final files will look like and you then commit them as you would have normally. So, conflicts are like a case of special editing.

这篇关于什么时候 svn BASE 变得等于 HEAD的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！