当分支提交到主干时,CVS 提交到检出的目录

发布于 2024-10-19 20:06:20 字数 397 浏览 8 评论 0原文

我创建了一个新的 CVS 分支,将其签出并向其中添加了一些文件夹和文件。一旦我提交了分支更改,文件和目录就不会像人们所期望的那样提交到我的分支中,而是提交到主干中。

根据此页面这是由于...

由于针对 cvs 1.3(rcvs 当前所基于的)中的一个错误,如果您在分支上检出的目录中添加新文件,该文件将出现在主线上,而不是您的分支上。警告 scriptor。

因此,目前我仅在主干中拥有这些新文件。幸好没有坏处。但是我怎样才能将这些新文件也放入分支中呢?有什么建议吗?理想情况下使用 IntelliJ 9.0 作为 CVS 客户端。谢谢!

I created a new CVS branch, checked it out and addded some folder and files into it. Once I committed the branch changes the files and the directory were committed not into my branch as one would expect but into the trunk.

According to this page this is caused ...

Due to a bug in cvs 1.3 (on which rcvs is currently based), if you add a new file in a directory checked out on a branch, the file will appear on the main line, not on your branch. Caveat scriptor.

So currently I have these new files in trunk only. Fortunatelly no harm. But how can I get those new files into the branch as well? Any tips? Ideally using IntelliJ 9.0 as CVS client. Thanks!

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

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

发布评论

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

评论(2

独自←快乐 2024-10-26 20:06:20

在最简单的情况下,这应该做到这一点(在您的工作副本中,从新目录的父文件夹中):

cvs up -rBranch
cvs up -jHEAD -d NewDirectory

即将您的工作副本更新到分支,然后合并来自 NewDirectory 的主干版本的更改(在该过程中创建它) (-d 参数))。之后你仍然需要承诺。

In the simplest case, this should do it (inside your working copy, from the parent folder of your new directory):

cvs up -rBranch
cvs up -jHEAD -d NewDirectory

I.e. update your working copy to the branch and then merge in changes from the trunk version of NewDirectory (creating it in the process (the -d argument)). You still need to commit after that.

最笨的告白 2024-10-26 20:06:20

所以我最终解决了这个问题,所以分享我的经验:

  • 令人惊讶的是,向 CVS 分支添加新文件通常是令人头痛的,每个人(除了我自己)都知道这一点。
  • 有许多客户端无法像 IntelliJ 9 或 SmartCVS 6 那样做到这一点,但至少有一个能够完成将新文件添加到分支中这一超级困难的任务......
  • 对我来说,获胜者是 tortoiseCVS

So I solved it finally so sharing my experience:

  • suprisingly adding new files to CVS branch is headache in general and everyone (except of myself) knew that.
  • there are many clients which can't do that like IntelliJ 9 or SmartCVS 6 but there is at least one which is capable of this super-diffcult task of adding new files into a branch ...
  • for me the winner was tortoiseCVS
~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文