ClearCase:离线劫持文件,然后签出/合并

发布于 2024-11-02 15:32:00 字数 359 浏览 9 评论 0原文

我正在考虑一个场景,其中我有一个离线清除案例视图,并且我修改了该视图中的文件,清除了我修改的文件上的只读属性(劫持),然后几天后我将视图联机并需要获取我的离线更改到流中。

我要做的就是检查被劫持的文件并将它们重新检入(必要时合并)。

这样工作总是安全吗?
在添加我的更改时,我是否可能会意外覆盖其他人在离线工作时所做的更改? 关于如何离线使用 ClearCase 有什么建议吗?

谢谢!

(我问这个问题是因为一所大学说这种离线工作方式可能会导致覆盖其他人的更改,特别是在离线工作一段时间后更新视图的情况下,然后再将被劫持的文件转换为签出。他说不会事件建议在某些情况下进行合并,只需用被劫持文件的内容完全覆盖正在转换的元素的内容)

I'm looking at a scenario where I have an offline clear case view and I modify files in this view clearing the read-only attribute (hijacking) on the files I modify then several days later I take the view online and need to get my offline changes into the stream.

What I would do is check out the hijacked files and check them back in (merging when necessary).

Is it always safe to work this way?
Is it possible that while adding my changes I would accidentally overwrite other people's changes done while I was working offline?
Any recommendations on how to use ClearCase offline?

Thanks!

(I'm asking because a college says that this offline way of working can lead to overwriting other's changes, specifically in cases when one updates ones view after working offline for a while before converting the hijacked files into checkouts. He says it won't event propose to do a merge in some cases, just completely overwrite the contents of the element being converted with the contents of the hijacked file)

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

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

发布评论

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

评论(2

美胚控场 2024-11-09 15:32:00

不,离线工作时您不会覆盖任何内容。

ClearCase 有一个快照视图协调机制,当您重新上线时,您可以:

  • 搜索所有被劫持的文件
  • 检出这些文件
  • ,然后检入它们,此时 ClearCase 将提示您进行合并(如果有新版本)在您离线期间已对该文件进行了处理。
    该合并将是三向合并:

    • 根版本:您或其他人进行任何修改之前的版本
    • 源版本:mateest 签入版本(离线时完成)
    • 目标版本:您当前的文件

No you won't override anything while working offline.

ClearCase has a reconcliation mechanism for a snapshot view, which, when you get back online, will allow you to:

  • search for all hijacked files
  • checkout those files
  • then checkin them, which is when ClearCase will prompt you for a merge, if any new version has been done on that file during your time offline.
    That merge will be a three-way merge with:

    • root version: the version before any modification by you or other
    • source version: the matest checkin version (done while you were offline)
    • destination version: your current file
毁梦 2024-11-09 15:32:00

如何设置一个私有分支,对其进行处理,劫持那里的文件,然后将您的私有分支合并到主分支上?

What about setuping a private branch, working on it, hijacking there files and then merging your private branch on the main branch?

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