如何组织版本控制存储库？

首先，我知道这个问题: 你会如何组织一个 Subversion 存储库用于内部软件项目？ 接下来，真正的问题是: 我的团队正在重组我们的存储库，我正在寻找关于如何组织它的提示。 下面是我们得出的结论: 我们有一个存储库、多个项目和多个 svn: foreign 交叉引用

\commonTools /*tools used in all projects. Referenced in each project with svn:externals*/
\NUnit.v2.4.8
\NCover.v.1.5.8
\<other similar tools>
\commonFiles /*settings strong name keys etc.*/
\ReSharper.settings
\VisualStudio.settings
\trash /*each member of the team has trash for samples, experiments etc*/
\user1
\user2
\projects
\Solution1 /*Single actual project (Visual Studio Solution)*/
\trunk
\src
\Project1 /*Each sub-project resulting in single .dll or .exe*/
\Project2
\lib
\tools
\tests
\Solution1.sln
\tags
\branches
\Solution2
\trunk
\src
\Project3 /*Each sub-project resulting in single .dll or .exe*/
\Project1 /*Project1 from Solution1 references with svn:externals*/
\lib
\tools
\tests
\Solution2.sln
\tags
\branches

要清除词汇表: 解决方案意味着单个产品，Project 是 VisualStudio 项目(它导致单个。Dll 或 single。Exe)

我们计划这样布置仓库。主要的问题是，我们有多个解决方案，但是我们希望在解决方案之间共享项目。 我们认为将这些共享的项目移动到它们自己的解决方案中是没有意义的，因此我们决定使用 svn: foreign 来在解决方案之间共享项目。我们还希望将公共工具集和第三方库保存在存储库中的一个位置，并且它们在每个解决方案中使用 svn: foreign 引用它们。

你觉得这个布局怎么样？特别是关于 svn: foreign 的使用。这不是一个理想的解决方案，但考虑到所有的利弊，这是我们能想到的最好的办法。你会怎么做？

31777 次浏览
小开

I believe that Pragmatic Version Control using Subversion has everything you need to organize your repository.

小开

We've set ours up to almost exactly match what you've posted. We use the general form:

\Project1
\Development (for active dev - what you've called "Trunk", containing everything about a project)
\Branches (For older, still-evolving supported branches of the code)
\Version1
\Version1.1
\Version2
\Documentation (For any accompanying documents that aren't version-specific

While I suppose not as complete as your example, it's worked well for us and lets us keep things separate. I like the idea of each user having a "Thrash" folder as well - currently, those types of projects don't end up in Source control, and I've always felt that they should.

小开

I have a similar layout, but my trunk, branches, tags all the way at the top. So: /trunk/main, /trunk/utils, /branches/release/, etc.

This ended up being really handy when we wanted to try out other version control systems because many of the translation tools worked best with the basic textbook SVN layout.

小开

I think the main disadvantage of the proposed structure is that the shared projects will only be versioned with the first solution they were added to (unless svn:externals is fancier than I am imagining). For example, when you create a branch for the first release of Solution2, Project1 won't be branched since it lives in Solution1. If you need to build from that branch at a later time (QFE release), it will use the latest version of Project1 rather than version of Project1 at the time of the branch.

For this reason, it may be advantageous to put the shared projects in one or more shared solutions (and thus top-level directories in your structure) and then branch them with each release of any solution.

小开

Why have it all in one repository? Why not just have a separate repository for each project (I mean "Solution")?

Well, at least I've used to the one-project-per-repository-approach. Your repository structure seems overcomplicated to me.

And how many project do you plan to put into this one big repository? 2? 3? 10? 100?

And what do you do when you cancel the development of one project? Just delete it from repository tree so that it will become hard to find in the future. Or leave it lying around forever? Or when you want to move one project to another server altogether?

And what about the mess of all those version numbers? The version numbers of one project going like 2, 10, 11, while the other goes like 1, 3, 4, 5, 6, 7, 8, 9, 12...

Maybe I'm foolish, but I like one project per repository.

小开

To add to the relative path issue:

I am not sure it is a problem:
Just checkout Solution1/trunk under the directory named "Solution1", ditto for Solution2: the goal of 'directories' actually representing branches is to not be visible once imported into a workspace. Hence relative paths are possible between 'Solution1' (actually 'Solution1/trunk') and 'Solution2' (Solution2/trunk).

小开

RE: the relative path and shared file issue -

It seems that this is svn specific, but that is not a problem. One other person already mentioned separate repositories and that is probably the best solution I can think of in the case where you have different projects referring to arbitrary other projects. In the case where you have no shared files then the OP solution (As well as many others) will work fine.

We're still working this out and I have 3 different efforts (different clients) that I have to resolve right now since I took over setting up either non-existent or poor version control.

小开
最佳答案

If you follow my recommendations below (I have for years), you will be able to:

-- put each project anywhere in source control, as long as you preserve the structure from the project root directory on down

-- build each project anywhere on any machine, with minimum risk and minimum preparation

-- build each project completely stand-alone, as long as you have access to its binary dependencies (local "library" and "output" directories)

-- build and work with any combination of projects, since they are independent

-- build and work with multiple copies/versions of a single project, since they are independent

-- avoid cluttering your source control repository with generated files or libraries

I recommend (here's the beef):

  1. Define each project to produce a single primary deliverable, such as an .DLL, .EXE, or .JAR (default with Visual Studio).

  2. Structure each project as a directory tree with a single root.

  3. Create an automated build script for each project in its root directory that will build it from scratch, with NO dependencies on an IDE (but don't prevent it from being built in the IDE, if feasible).

  4. Consider nAnt for .NET projects on Windows, or something similar based on your OS, target platform, etc.

  5. Make every project build script reference its external (3rd-party) dependencies from a single local shared "library" directory, with every such binary FULLY identified by version: %DirLibraryRoot%\ComponentA-1.2.3.4.dll, %DirLibraryRoot%\ComponentB-5.6.7.8.dll.

  6. Make every project build script publish the primary deliverable to a single local shared "output" directory: %DirOutputRoot%\ProjectA-9.10.11.12.dll, %DirOutputRoot%\ProjectB-13.14.15.16.exe.

  7. Make every project build script reference its dependencies via configurable and fully-versioned absolute paths (see above) in the "library" and "output" directories, AND NO WHERE ELSE.

  8. NEVER let a project directly reference another project or any of its contents--only allow references to the primary deliverables in the "output" directory (see above).

  9. Make every project build script reference its required build tools by a configurable and fully-versioned absolute path: %DirToolRoot%\ToolA\1.2.3.4, %DirToolRoot%\ToolB\5.6.7.8.

  10. Make every project build script reference source content by an absolute path relative to the project root directory: ${project.base.dir}/src, ${project.base.dir}/tst (syntax varies by build tool).

  11. ALWAYS require a project build script to reference EVERY file or directory via an absolute, configurable path (rooted at a directory specified by a configurable variable): ${project.base.dir}/some/dirs or ${env.Variable}/other/dir.

  12. NEVER allow a project build script to reference ANYTHING with a relative path like .\some\dirs\here or ..\some\more\dirs, ALWAYS use absolute paths.

  13. NEVER allow a project build script to reference ANYTHING using an absolute path that does not have a configurable root directory, like C:\some\dirs\here or \\server\share\more\stuff\there.

  14. For each configurable root directory referenced by a project build script, define an environment variable that will be used for those references.

  15. Attempt to minimize the number of environment variables you must create to configure each machine.

  16. On each machine, create a shell script that defines the necessary environment variables, which is specific to THAT machine (and possibly specific to that user, if relevant).

  17. Do NOT put the machine-specific configuration shell script into source control; instead, for each project, commit a copy of the script in the project root directory as a template.

  18. REQUIRE each project build script to check each of its environment variables, and abort with a meaningful message if they are not defined.

  19. REQUIRE each project build script to check each of its dependent build tool executables, external library files, and dependent project deliverable files, and abort with a meaningful message if those files do not exist.

  20. RESIST the temptation to commit ANY generated files into source control--no project deliverables, no generated source, no generated docs, etc.

  21. If you use an IDE, generate whatever project control files you can, and don't commit them to source control (this includes Visual Studio project files).

  22. Establish a server with an official copy of all external libraries and tools, to be copied/installed on developer workstations and build machines. Back it up, along with your source control repository.

  23. Establish a continuous integration server (build machine) with NO development tools whatsoever.

  24. Consider a tool for managing your external libraries and deliverables, such as Ivy (used with Ant).

  25. Do NOT use Maven--it will initially make you happy, and eventually make you cry.

Note that none of this is specific to Subversion, and most of it is generic to projects targeted to any OS, hardware, platform, language, etc. I did use a bit of OS- and tool-specific syntax, but only for illustration--I trust that you will translate to your OS or tool of choice.

Additional note regarding Visual Studio solutions: don't put them in source control! With this approach, you don't need them at all or you can generate them (just like the Visual Studio project files). However, I find it best to leave the solution files to individual developers to create/use as they see fit (but not checked in to source control). I keep a Rob.sln file on my workstation from which I reference my current project(s). Since my projects all stand-alone, I can add/remove projects at will (that means no project-based dependency references).

Please don't use Subversion externals (or similar in other tools), they are an anti-pattern and, therefore, unnecessary.

When you implement continuous integration, or even when you just want to automate the release process, create a script for it. Make a single shell script that: takes parameters of the project name (as listed in the repository) and tag name, creates a temporary directory within a configurable root directory, checks out the source for the given project name and tag name (by constructing the appropriate URL in the case of Subversion) to that temporary directory, performs a clean build that runs tests and packages the deliverable. This shell script should work on any project and should be checked into source control as part of your "build tools" project. Your continuous integration server can use this script as its foundation for building projects, or it might even provide it (but you still might want your own).

@VonC: You do NOT want to work at all times with "ant.jar" rather than "ant-a.b.c.d.jar" after you get burned when your build script breaks because you unknowingly ran it with an incompatible version of Ant. This is particularly common between Ant 1.6.5 and 1.7.0. Generalizing, you ALWAYS want to know what specific version of EVERY component is being used, including your platform (Java A.B.C.D) and your build tool (Ant E.F.G.H). Otherwise, you will eventually encounter a bug and your first BIG problem will be tracking down what versions of your various components are involved. It is simply better to solve that problem up front.


提交答案