ClearCase:处理脱机劫持文件，然后检出/合并 [英] ClearCase: Working offline hijacking files, then checking out / merging

问题描述

我正在查看一个场景，其中有一个脱机的清除案例"视图，并且我在此视图中修改了文件，清除了我修改的文件上的只读属性(劫持)，然后几天后我将该视图联机并需要以便将我的离线更改添加到信息流中.

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).

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

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?

谢谢！

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

(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)

推荐答案

不，您在离线工作时不会覆盖任何内容.

No you won't override anything while working offline.

ClearCase具有快照视图的重新构造机制，当您重新联机时，它将允许您:

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

• 搜索所有被劫持的文件
• 检出这些文件
• 然后签入它们，这是ClearCase提示您进行合并的时间，如果您在离线期间对该文件进行了任何新版本.
  该合并将是以下三种方式的合并:
  • 根版本:您或其他人进行任何修改之前的版本
  • 源版本:最晚的签入版本(离线时完成)
  • 目标版本:您当前的文件
  • 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

    这篇关于ClearCase:处理脱机劫持文件，然后检出/合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！