New project or branch?

北城以北 提交于 2019-12-23 09:01:12

问题


I have a solution in Subversion that I now will create a customer specific version of. It's unlikely that this version ever fully will get merged back into the main development. There will however be development both in the main trunk that I easily need to get into the specific project and the other way around (development in the custom project that needs to go back into the main trunk).

Should the new custom project be a branch that lives in parallel with the main development or a new project within the the same repository in your opinion?


回答1:


I would definitely create a new branch. If the two variations of the project still share a lot of common code, and there's still even a remote likeliness they might be merged back together, I don't see any benefit in separating them into two totally independent projects.

I'd go with a branch - it gives you the options to later merge stuff back together, if needed.

Marc




回答2:


If they are in the same repository, then it does not matter. You can still merge from the one project tree to the other.

Otherwise, my gut feel says "branch"




回答3:


In theory this is a branch. So I would suggest to work with it as such.




回答4:


I would say this is a branch. While you may not merge from the custom version to the head, its that likely code in the mainstream/head that you might want to migrate into your custom branch to upgrade the custom version. While this can be done in separate repositories its not as "visible" if its in a single place and when something falls off the radar it tends to lag behind and fall into disrepair.




回答5:


Since this is a modification to the main development, a branch would be best.

A branch will allow for merges in both directions using svn.

Creating a new project would require manual synchronization of changes.



来源:https://stackoverflow.com/questions/820839/new-project-or-branch

标签
易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!