When does svn BASE become equal to the HEAD

后端 未结 4 822
悲&欢浪女
悲&欢浪女 2020-12-23 17:36

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 agai

4条回答
  •  南笙
    南笙 (楼主)
    2020-12-23 17:54

    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.

    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.

提交回复
热议问题