查找ClearCase中所有未合并的文件/元素 [英] Find all unmerged files/elements in ClearCase

问题描述

我们在工作的地方使用ClearCase，我试图弄清楚如何查找已被修改但尚未合并的任何文件.我们在ClearCase的最顶层有一个主分支，这是最终源代码更改被合并到的地方，也是我们进行正式发行的基础.然后，我们在主要下设有一个集成分支，负责解决集成问题.当我们在集成分支中完成所有工作并进行了测试时，我们会将集成分支合并到主分支.对于单个功能实现和错误修复，我们从集成分支创建了一个新分支(通常以操作，功能或错误修正命名)，并解决了该问题.完成后，我们会将更改合并到集成分支.

We use ClearCase where I work and I'm trying to figure out how to find any files that have been modified but not merged up. We have a main branch at the very top level in ClearCase, and this is where the final source code changes are merged to and where we do our formal release builds from. We then have an integration branch under main where integration issues are worked out. When we get everything working and tested in the integration branch, we merge the integration branch up to main. For individual feature implementations and bug fixes, we create a new branch (usually named after an action, feature, or bugfix) off of the integration branch and work the issue. When we are done with it, we merge that change up to the integration branch.

我想知道是否有人知道命令或方法来查看功能/错误修复分支中修改了哪些文件，但没有合并回到集成分支.我一直在环顾四周，但似乎找不到解决方法.我希望能够运行该命令并将其告诉我在所有子分支上已修改但未合并的所有文件.谢谢.

I was wondering if anybody knew of a command or a way to see what files are modified in the feature/bug fix branches but were not merged back up to the integration branch. I've been looking around but I can't seem to find a way to do it. I would like to be able to run the command and have it tell me all files that have been modified on all of the sub-branches but not merged up. Thanks.

推荐答案

如果您知道源分支和目标分支( Jonathan 的 answer ，我已经投票赞成)，那么请不要忘记

If you know the source and destination branches (topic detailed in Jonathan's answer, which I have upvoted), then don't forget the query primitive merge:

merge (from-location , to-location)

在所有情况下，如果对象所属的元素具有连接from-location和to-location的合并超链接(默认名称:Merge)，则为TRUE.
您可以使用分支路径名或版本选择器指定一个或两个位置.
如果合并超链接涉及该分支上的任何版本，则指定分支将产生TRUE.
分支路径名必须完整(例如，/main/rel2_bugfix，而不是rel2_bugfix).

In all cases, TRUE if the element to which the object belongs has a merge hyperlink (default name: Merge) connecting the from-location and to-location.
You can specify either or both locations with a branch pathname or a version selector.
Specifying a branch produces TRUE if the merge hyperlink involves any version on that branch.
The branch pathname must be complete (for example, /main/rel2_bugfix, not rel2_bugfix).

此线程说明了正在执行的查询:

This thread illustrates that query in action:

如何找到特定分支上所有已签入且未合并的元素?

How is it possible to find all the elements on a specific branch that are checked in and not merged away?

cleartool find \\view\administration\ProjectVOB \
   -branch "brtype(HNH-372452) && \
   !merge(...\HNH-372452\LATEST,...\main-372452\LATEST)" -print

\\view\administration\ProjectVOB\Com-API\Dll\COMFrontendDll\Mmi.cpp@@\main\HNH-372452
\\view\administration\ProjectVOB\geometry\geochain\geocutterloc.cpp@@\main\HNH-372452

合并超链接"是您在版本树中看到的红色箭头:
(请参见文章"需求的版本控制和并行开发)

That "merge hyperlink" is the red arrow you see in version tree:
(see article "Versioning and parallel development of requirements")

这篇关于查找ClearCase中所有未合并的文件/元素的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！