覆盖另一个 Subversion 存储库中的某些文件

发布于 2024-09-07 23:06:26 字数 976 浏览 6 评论 0原文

我正在寻找一种方法，使 Subversion 存储库基本上成为另一个 Subversion 存储库的副本，除了我想要覆盖的其他存储库中的一些文件。

基本上，我想实现这样的目标：（

/
- branches/
  - mybranch/ = if files are added in /trunk, they get added here
    - file1 = latest rev of /trunk/file1
    - file2 = latest rev of /trunk/file2
    - file3 = unique, versioned file that belongs to mybranch only
    - dir1/ = if files are added in /trunk/dir1, they get added here
      - file4 = latest rev of /trunk/dir1/file4
      - file5 = unique, versioned file that belongs to mybranch only
- trunk/
  - file1
  - file2
  - file3
  - dir1/
    - file4
    - file5

这都在同一个存储库上，但这不应该相关）最终目标是，当有人检查 mybranch 时，他们会获得所有代码（trunk + mybranch 包含的差异），而不仅仅是特定于 mybranch 的代码。最有吸引力的解决方案是使用 svn:externals，但它可以在目录上工作吗？（也就是说，如果一个名为 file6 的文件被添加到 trunk，它也会自动添加到 mybranch 吗？）

如果分支不是正确的方法，那么会怎样？是？（我不是要求使用分支的正确方法，而是要求获得我所描述的内容的正确方法，无论它是否涉及分支。）

原文

I'm looking at a way to have a subversion repository to be basically a copy of another subversion repository, except a few files from the other repository that I want to override.

Basically, I would want to achieve something like this:

/
- branches/
  - mybranch/ = if files are added in /trunk, they get added here
    - file1 = latest rev of /trunk/file1
    - file2 = latest rev of /trunk/file2
    - file3 = unique, versioned file that belongs to mybranch only
    - dir1/ = if files are added in /trunk/dir1, they get added here
      - file4 = latest rev of /trunk/dir1/file4
      - file5 = unique, versioned file that belongs to mybranch only
- trunk/
  - file1
  - file2
  - file3
  - dir1/
    - file4
    - file5

(This is all on the same repo, but this shouldn't be relevant)
The final objective being that when someone checks out mybranch, they get all the code (trunk + the differences that mybranch contains), not just the code specific to mybranch.
The most attractive solution would be to use svn:externals, but would it work on directories? (That is, if a file called file6 is added to trunk, would it be added to mybranch automatically too?)

If a branch isn't the correct approach, what would be? (I'm not asking for the correct way to use a branch, I'm asking for the correct way to get what I described, whether it involves a branch or not.)

分享到QQ

分享到微博