I cannot commit changes after merge in SVN

后端 未结 3 1171
-上瘾入骨i
-上瘾入骨i 2021-01-05 22:19

I had a problem with committing changes after merging two branches of my project using TortoiseSVN.

Here are details:

I did a merge branch to trunk of pr

3条回答
  •  一个人的身影
    2021-01-05 23:08

    svn:external will cause Subversion to combine different repository paths on check-out, but ultimately those paths are still 'disjoint', so you have to do two commits to get the changes applied.

    Here's the relevant quote from Version Control with Subversion

    And Subversion still truly operates only on nondisjoint working copies. So, for example, if you want to commit changes that you've made in one or more of those external working copies, you must run svn commit explicitly on those working copies—committing on the primary working copy will not recurse into any external ones.

提交回复
热议问题