我如何将所有这些项目整合到 Bazaar 中?

发布于 2024-09-26 21:41:01 字数 996 浏览 1 评论 0原文

在我工作的地方,我们有大约 2 打或更多的项目,使用 SVN 作为版本控制。我的老板对存储库非常严格,但我认为这是误导的。例如,我们总是有一个“当前”分支用于开发,该分支在发布之前会合并到 Trunk 中。对于所有其他目的,“当前”是主干,我们不会创建更多分支。同样,他对文件内容也很挑剔,最重要的是,项目文件中的所有引用都必须遵循项目之间的“平面”目录结构(即,一个目录中的所有项目文件夹)。

现在,我认为我可以采用一种方法我的生活更轻松的是在本地使用 Bazaar,这样我就可以在自己的分支中处理功能,在本地频繁提交(用于更改跟踪),可能会重新组织我的项目,并且通常会让我的生活变得更轻松一些。

除了我无法完全弄清楚 Bazaar 的存储库结构!该标准似乎类似于

Project-Repo (Shared Repo)
    /Project-Trunk (Bound to SVN)
    /Project-Feature1 (Branch of Trunk)
    /Project-Feature2 (Branch of Trunk)

某些项目对其他项目的引用多达六个或更多。大多数功能都需要在任何给定时间对至少 2 个项目进行更改。我不知道如何处理。如果我将功能分支分解到其他文件夹中,我就会失去共享存储库的好处。如果我将它们保留在适当的位置,那么每次我需要为新功能分支项目时,我都必须重新配置所有引用。

我能想到的最好办法就是解决共享存储库缺乏的问题,并执行以下操作:

Branches
    /Feature1
         /ProjectA-Branch
         /ProjectB-Branch
    /Feature2
         /ProjectB-Branch
         /ProjectC-Branch

将主干全部存储为其他地方的单独存储库,只是为了合并和最终提交备份到 SVN。

这是我能够通过 Bazaar 获得的最佳布局吗?还是有一些我不知道的技术?考虑到它的普遍性,存储库布局是一项非常具有挑战性的练习。

Where I work at, we have about 2 dozen or more projects, using SVN as version control. My boss is pretty strict about the repositories, but misguided I think. For example, we always have one "Current" branch for development, which gets merged into Trunk before a release. For all other purposes, "Current" is the trunk and we don't ever make more branches. Likewise, he's picky about file contents, most pointedly, all the References in the project files must adhere to a "flat" directory structure between projects (ie, all project folders in one directory.)

Now, I figure that one way I can make my life easier would be to use Bazaar locally so I can work on features in their own branches, make frequent commits locally (for change tracking), possibly reorganize my projects, and generally make my life a little easier.

Except I can't quite get the repository structure for Bazaar figured out! The standard would seem to be something like

Project-Repo (Shared Repo)
    /Project-Trunk (Bound to SVN)
    /Project-Feature1 (Branch of Trunk)
    /Project-Feature2 (Branch of Trunk)

Some projects have up to a half-dozen or more references to other projects. And most features will require changes to at least 2 projects at any given time. I have no idea how to handle that. If I break the feature branches out into other folders, I lose the shared repository benefits. And if I leave them in place, then I'll have to reconfigure all the references each time I need to branch projects for a new feature.

The best I can think to do is just deal with the lack of shared repos and do something like this:

Branches
    /Feature1
         /ProjectA-Branch
         /ProjectB-Branch
    /Feature2
         /ProjectB-Branch
         /ProjectC-Branch

With the trunks all being stored as individual repos elsewhere just for the purpose of merging and final commits back up to SVN.

Is that the best layout I'll be able to get with Bazaar or are there techniques that I'm unaware of? Repository layout is a very challenging exercise considering how common it should be.

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(1

南城追梦 2024-10-03 21:41:01

我认为,考虑到它们都具有扁平本地名称的限制,这可能是最好的设置。

如果您不打算修改它们,您可以使其中一些目录实际上不是整个分支,而只是检出公共分支。

I think, given the constraints about them all having flat local names, this is probably the best setup.

You could make some of those directories actually not be whole branches, but just checkouts of the common branch, if you don't intend to modify them.

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文