ClearCase希望在交付到备用目标后合并未更改的文件_Clearcase_Clearcase Ucm

ClearCase希望在交付到备用目标后合并未更改的文件

clearcase

ClearCase希望在交付到备用目标后合并未更改的文件,clearcase,clearcase-ucm,Clearcase,Clearcase Ucm,使用RationalClearCaseV。7.0.1.1对于UCM，我在使用ClearCase的“从流交付到备用目标”功能时遇到了一个问题假设我们有一个项目集成流和从中派生的两个开发人员流A和B。现在我更改流a中的一个文件。我希望拥有流B的delevoper能够使用我的工作，而不必将文件交付到集成流，因此我从流a交付到备用目标流B 到目前为止，一切顺利。我继续对文件进行另一个更改，但stream B开发人员不需要此更改，因此我不会将其交付给他再过一段时间，我将工作交付到主集成流。这很好，尽管

使用RationalClearCaseV。7.0.1.1对于UCM，我在使用ClearCase的“从流交付到备用目标”功能时遇到了一个问题

假设我们有一个项目集成流和从中派生的两个开发人员流A和B。现在我更改流a中的一个文件。我希望拥有流B的delevoper能够使用我的工作，而不必将文件交付到集成流，因此我从流a交付到备用目标流B

到目前为止，一切顺利。我继续对文件进行另一个更改，但stream B开发人员不需要此更改，因此我不会将其交付给他

再过一段时间，我将工作交付到主集成流。这很好，尽管我想知道为什么ClearCase将合并标记为普通的“合并”而不是“合并（普通）”——除了我之外，没有人对文件进行过更改

交付之后，在主集成流上创建一个新的基线

当开发人员B尝试重新设置其流的基础时，真正的问题就出现了。由于开发人员B从未对文件做过任何更改，因此我希望合并是一个不需要交互的简单合并。但实际情况是，开发人员B被迫以图形方式解决该文件上的合并冲突，让他在集成流上的基本版本、我交付给他的版本和我交付给集成流的版本之间进行选择

当解决合并并完成重基后，开发人员B想要执行到主集成流的交付时，这种混乱会继续下去。除了我最初交付给他的活动外，他还提供了一个名为rebase_u…（rebase_u…）的活动，这是我从未期望过的

我是不是遗漏了什么？我们是否错误地使用了ClearCase，或者这是一个已知的限制/错误？有人使用过这个功能吗

提前感谢您的帮助

J.< /P> < P>我很惊讶这种冲突：因为CycCase1确实登记了从A到B的合并，除非流B没有与Stream A.

相同的基础基线（分支起点或初始标签）。除了我最初交付给他的活动外，他还提供了一个名为rebase_u…（rebase_u…）的活动，这是我从未期望过的

当您从Int重设为B时，您将创建一个自动“时间线”，将所有活动链接在一起。
这意味着，在下一次交付期间，B将必须交付重新基础，即使不会对该变更集中存在的所有版本执行合并

首先有几点评论：

您可能希望避免创建附加到资源的流（开发人员“A”，开发人员“B”）：如果他们正在为同一个全局“开发工作”处理单独的文件集，则应该只有一个流功能表示手头的任务。
然后，A和B应该看到连接到该流的相同分支的相同最新版本（无需从一个流传递到另一个流）
如果B不断打断A的工作，则只有在这种情况下，才能为破坏性子特征创建一个子流，该子特征不能与主特征“F”同时开发
当合并为时，deliver/rebase GUI不会显示“Yes（平凡）”（请参阅下面的测试）。这并不意味着合并不是微不足道的（意味着基础与源或目标相同，请参见）
我下面的测试尊重您描述的合并工作流程，但只显示琐碎的合并。
“邪恶双胞胎”（一个文件在一个流中添加，但在另一个流中重新创建，名称相同）可以解释非平凡的双胞胎

好的，让我们测试一下，假设一个Vob“adev”（代表“开发架构”，我的团队在这里存储它的工具），在\adev\test中有一个UCM组件ADV\u TST。
Windows上的ClearCase7.0.1（尽管Vob实际上在Unix上）

让我们从一个测试项目、一个集成流和一个空测试组件开始：

M:\>ct mkproj -in folder:ADV_Tests@\myPVob Test_DeliverToAlternateTarget@\myPVob
M:\>ct mkstream -int -in Test_DeliverToAlternateTarget@\myPVob Test_DAT_Int@\myPVob
Created stream "Test_DAT_Int".
M:\>ct mkview -tag vonc_test_dat_int -stream Test_DAT_Int@\myPVob -stg hostname_ccstg_c_views
M:\vonc_test_dat_int\adev\test>ct rebase -bas ADV_TST0.0.0
Adding baseline "ADV_TST0.0.0" of new component "ADV_TST"
M:\vonc_test_dat_int\adev\test>ct rebase -complete

让我们将组件设置为可写：

M:\vonc_test_dat_int\adev\test>ct chproj -amodcomp component:ADV_TST@\myPVob Test_DeliverToAlternateTarget@\myPVob
M:\vonc_test_dat_int\adev\test>ct chstream -generate Test_DAT_Int@\myPVob
M:\vonc_test_dat_int\adev\test>ct setcs -stream

A将在Int上创建一个文件，添加它，修改它，然后放置一个基线：

M:\vonc_test_dat_int\adev\test>ct mkact test_dat_int
M:\vonc_test_dat_int\adev\test>echo first line done on Int>aFile.txt
M:\vonc_test_dat_int\adev\test>ct co -nc .
M:\vonc_test_dat_int\adev\test>ct mkelem -nc aFile.txt
M:\vonc_test_dat_int\adev\test>ct ci -nc .
M:\vonc_test_dat_int\adev\test>ct ci -nc aFile.txt

M:\vonc_test_dat_int\adev\test>ct co -nc aFile.txt
M:\vonc_test_dat_int\adev\test>echo Second line from Int>>aFile.txt
M:\vonc_test_dat_int\adev\test>ct ci -nc aFile.txt

M:\vonc_test_dat_int\adev\test>type aFile.txt
first line done on Intct mkview vonc_
Second line from Int

M:\vonc_test_dat_int\adev\test>ct mkbl -comp ADV_TST@\myPVob TST_DAT1.0.0
Created baseline "TST_DAT1.0.0" in component "ADV_TST".

现在，让我们创建两个子流，每个开发人员一个子流（可能被认为是“坏做法”），都使用相同的基线

TST_DAT1.0.0

初始化：

M:\vonc_test_dat_int\adev\test>ct mkstream -in Test_DAT_Int@\myPVob Test_DAT_A@\myPVob
M:\vonc_test_dat_int\adev\test>ct mkstream -in Test_DAT_Int@\myPVob Test_DAT_B@\myPVob
M:\vonc_test_dat_int\adev\test>ct mkview -tag vonc_test_dat_a -stream Test_DAT_A@\myPVob -stg hostname_ccstg_c_views
M:\vonc_test_dat_int\adev\test>ct mkview -tag vonc_test_dat_b -stream Test_DAT_B@\myPVob -stg hostname_ccstg_c_views
M:\vonc_test_dat_int\adev\test>ct rebase -view vonc_test_dat_a -bas TST_DAT1.0.0
M:\vonc_test_dat_int\adev\test>ct rebase -view vonc_test_dat_a -complete
M:\vonc_test_dat_int\adev\test>ct rebase -view vonc_test_dat_b -bas TST_DAT1.0.0
M:\vonc_test_dat_int\adev\test>ct rebase -view vonc_test_dat_b -complete

A将对其流A进行修改，并交付给B：

M:\vonc_test_dat_a\adev\test>ct mkact test_dat_a
M:\vonc_test_dat_a\adev\test>ct co -nc aFile.txt
Created branch "Test_DAT_A" from "aFile.txt" version "\main\Test_DAT_Int\2".
M:\vonc_test_dat_a\adev\test>echo Addition by A to be delivered to B first>>aFile.txt
M:\vonc_test_dat_a\adev\test>ct ci -nc aFile.txt

直接从流A传送到流B：

M:\vonc_test_dat_a\adev\test>ct deliver -to vonc_test_dat_b -target Test_DAT_B@\myPVob -cact -gmerge
Changes to be DELIVERED to non-default target stream in current project "Test_DeliverToAlternateTarget":
          FROM: stream "Test_DAT_A"
          TO: stream "Test_DAT_B"
Using target view: "vonc_test_dat_b".
Activities included in this operation:
        activity:test_dat_a@\myPVob   vonc        "test_dat_a"
Created branch "Test_DAT_B" from "M:\vonc_test_dat_b\adev\test\aFile.txt" version "\main\Test_DAT_Int\2".
Checked out "M:\vonc_test_dat_b\adev\test\aFile.txt" from version "\main\Test_DAT_Int\Test_DAT_B\0".
  Attached activity:
    activity:deliver.Test_DAT_A.20090707.123738@\myPVob  "deliver Test_DAT_A on 07/07/09 12:37:38 PM."
Needs Merge "M:\vonc_test_dat_b\adev\test\aFile.txt" [to \main\Test_DAT_Int\Test_DAT_B\CHECKEDOUT from \main\Test_DAT_Int\Test_DAT_A\1 b
ase \main\Test_DAT_Int\2]
Trivial merge: "M:\vonc_test_dat_b\adev\test\aFile.txt" is same as base "M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\
2".
Copying "M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\Test_DAT_A\1" to output file.
Deliver has merged
M:\vonc_test_dat_a\adev\test>ct deliver -target Test_DAT_B@\myPVob -force -complete

我确认GUI没有显示普通，尽管同一交付的文本输出确实提到了普通合并

A继续处理“

aFile.txt

”，并将其传递给Int：

M:\vonc_test_dat_a\adev\test>ct co -nc aFile.txt
M:\vonc_test_dat_a\adev\test>echo Modification by A to be delivered to Int, B does not need it>>aFile.txt
M:\vonc_test_dat_a\adev\test>ct ci -nc aFile.txt

M:\vonc_test_dat_a\adev\test>ct deliver
Changes to be DELIVERED to default target stream in project "Test_DeliverToAlternateTarget":
          FROM: stream "Test_DAT_A"
          TO: stream "Test_DAT_Int"
Using target view: "vonc_test_dat_int".
Activities included in this operation:
        activity:test_dat_a@\myPVob   vonc        "test_dat_a"
Do you wish to continue with this deliver operation?  [no] yes
Checked out "M:\vonc_test_dat_int\adev\test\aFile.txt" from version "\main\Test_DAT_Int\2".
  Attached activity:
    activity:deliver.Test_DAT_A.20090707.124108@\myPVob  "deliver Test_DAT_A on 07/07/09 12:41:08 PM."
Needs Merge "M:\vonc_test_dat_int\adev\test\aFile.txt" [to \main\Test_DAT_Int\CHECKEDOUT from \main\Test_DAT_Int\Test_DAT_A\2 base \main
\Test_DAT_Int\2]
Trivial merge: "M:\vonc_test_dat_int\adev\test\aFile.txt" is same as base "M:\vonc_test_dat_int\adev\test\aFile.txt@@\main\Test_DAT_
Int\2".
Copying "M:\vonc_test_dat_int\adev\test\aFile.txt@@\main\Test_DAT_Int\Test_DAT_A\2" to output file.
Deliver has merged
M:\vonc_test_dat_a\adev\test>ct deliver -force -complete

（另一个琐碎的合并）

让我们以Int为基准：

M:\vonc_test_dat_a\adev\test>ct mkbl -nc -view vonc_test_dat_int TST_DAT1.1.0
Created baseline "TST_DAT1.1.0" in component "ADV_TST".
Begin incrementally labeling baseline "TST_DAT1.1.0".
Done incrementally labeling baseline "TST_DAT1.1.0".

现在，我们切换到B，他从自己在另一个文件上的一点工作开始：

M:\vonc_test_dat_b\adev\test>ct mkact test_dat_b
M:\vonc_test_dat_b\adev\test>echo myFile by B>aFileByB.txt
M:\vonc_test_dat_b\adev\test>ct co -nc .
M:\vonc_test_dat_b\adev\test>ct mkelem -nc aFileByB.txt
M:\vonc_test_dat_b\adev\test>ct ci -nc aFileByB.txt
M:\vonc_test_dat_b\adev\test>ct ci -nc .

然后，突然间，他不得不用整合在Int中的内容重新确定他的工作：

M:\vonc_test_dat_b\adev\test>ct rebase -bas TST_DAT1.1.0
Advancing to baseline "TST_DAT1.1.0" of component "ADV_TST"
Updating rebase view's config spec...
Creating integration activity...
Setting integration activity...
Merging files...
Checked out "M:\vonc_test_dat_b\adev\test\aFile.txt" from version "\main\Test_DAT_Int\Test_DAT_B\1".
  Attached activity:
    activity:rebase.Test_DAT_B.20090707.125044@\myPVob  "rebase Test_DAT_B on 07/07/09 12:50:44 PM."
Needs Merge "M:\vonc_test_dat_b\adev\test\aFile.txt" [to \main\Test_DAT_Int\Test_DAT_B\CHECKEDOUT from \main\Test_DAT_Int\3 base \main\T
est_DAT_Int\Test_DAT_A\1]
Trivial merge: "M:\vonc_test_dat_b\adev\test\aFile.txt" is same as base "M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\
Test_DAT_A\1".
Copying "M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\3" to output file.
Output of merge is in "M:\vonc_test_dat_b\adev\test\aFile.txt".
Recorded merge of "M:\vonc_test_dat_b\adev\test\aFile.txt".

M:\vonc_test_dat_b\adev\test>type aFile.txt
first line done on Int
Second line from Int
Addition by A to be delivered to B first
Modification by A to be delivered to Int, B does not need it

M:\vonc_test_dat_b\adev\test>ct rebase -complete

完全没有冲突：琐碎的合并再次发生

B继续处理他的文件：

M:\vonc_test_dat_b\adev\test>ct setact test_dat_b
M:\vonc_test_dat_b\adev\test>ct co -nc aFileByB.txt
M:\vonc_test_dat_b\adev\test>echo a modif by B to be delivered to Int>>aFileByB.txt
M:\vonc_test_dat_b\adev\test>ct ci -nc aFileByB.txt

然后他将所有工作交付给Int：

M:\vonc_test_dat_b\adev\test>ct deliver -cact
cleartool: Error: Activity "deliver.Test_DAT_A.20090707.123738" must be added to activity list to preserve baseline order in stream.
cleartool: Error: Activity "rebase.Test_DAT_B.20090707.125044" must be added to activity list to preserve baseline order in stream.
cleartool: Error: The list of activities specified is incomplete.
cleartool: Error: Unable to deliver selected activities.
cleartool: Error: Unable to deliver stream "Test_DAT_B".

我确认他必须选择所有活动（不仅仅是他的活动）：上次重新基准期间设置的时间线已将所有活动链接在一起。
尽管不会与活动“deliver.Test_DAT_A.20090707.123738”和活动“rebase.Test_DAT_B.20090707.125044”合并，但它们必须包括：

M:\vonc_test_dat_b\adev\test>ct deliver Changes to be DELIVERED to default target stream in project "Test_DeliverToAlternateTarget": FROM: stream "Test_DAT_B" TO: stream "Test_DAT_Int" Using target view: "vonc_test_dat_int". Activities included in this operation: activity:deliver.Test_DAT_A.20090707.123738@\myPVob vonc "deliver Test_DAT_A on 07/07/09 12:37:38 PM." activity:test_dat_b@\myPVob vonc "test_dat_b" activity:rebase.Test_DAT_B.20090707.125044@\myPVob vonc "rebase Test_DAT_B on 07/07/09 12:50:44 PM." Do you wish to continue with this deliver operation? [no] Attached activity: activity:deliver.Test_DAT_B.20090707.131614@\myPVob "deliver Test_DAT_B on 07/07/09 1:16:14 PM." Needs Merge "M:\vonc_test_dat_int\adev\test" [to \main\Test_DAT_Int\CHECKEDOUT from \main\Test_DAT_Int\Test_DAT_B\1 base \main\Test_DAT_ Int\1] ******************************** <<< directory 1: M:\vonc_test_dat_int\adev\test@@\main\Test_DAT_Int\1 >>> directory 2: M:\vonc_test_dat_int\adev\test@@\main\Test_DAT_Int\Test_DAT_B\1 >>> directory 3: M:\vonc_test_dat_int\adev\test ******************************** -----------[ directory 1 ]-------------|---------[ added directory 2 ]--------- -| aFileByB.txt --07-07T12:50 vonc *** Automatic: Applying ADDITION from directory 2 Recorded merge of "M:\vonc_test_dat_int\adev\test". Created branch "Test_DAT_Int" from "M:\vonc_test_dat_int\adev\test\aFileByB.txt" version "\main\0". Checked out "M:\vonc_test_dat_int\adev\test\aFileByB.txt" from version "\main\Test_DAT_Int\0". Attached activity: activity:deliver.Test_DAT_B.20090707.131614@\myPVob "deliver Test_DAT_B on 07/07/09 1:16:14 PM." Needs Merge "M:\vonc_test_dat_int\adev\test\aFileByB.txt" [to \main\Test_DAT_Int\CHECKEDOUT from \main\Test_DAT_B\2 base \main\0] Trivial merge: "M:\vonc_test_dat_int\adev\test\aFileByB.txt" is same as base "M:\vonc_test_dat_int\adev\test\aFileByB.txt@@\main\0". Copying "M:\vonc_test_dat_int\adev\test\aFileByB.txt@@\main\Test_DAT_B\2" to output file. Deliver has merged M:\vonc_test_dat_b\adev\test>ct deliver -complete

M:\vonc\U test\U dat\U b\adev\test>ct交付要传递到项目“Test_DeliverToAlternateTarget”中默认目标流的更改：来自：流“测试数据” 发送至：流式传输“测试数据” 使用目标视图：“vonc\U test\U dat\U int”。该行动包括的活动：活动：交付.测试数据A.20090707.123738@\myPVob M:\vonc_test_dat_a\adev\test>ct co -nc aFile.txt M:\vonc_test_dat_a\adev\test>echo modif by A to B>>aFile.txt M:\vonc_test_dat_a\adev\test>ct ci -nc aFile.txt M:\vonc_test_dat_a\adev\test>type aFile.txt first line done on Int Second line from Int Addition by A to be delivered to B first Modification by A to be delivered to Int, B does not need it modif by A to B M:\vonc_test_dat_a\adev\test>ct deliver -to vonc_test_dat_b -target Test_DAT_B@\myPVob -cact -gmerge -force Changes to be DELIVERED to non-default target stream in current project "Test_DeliverToAlternateTarget": FROM: stream "Test_DAT_A" TO: stream "Test_DAT_B" Using target view: "vonc_test_dat_b". Activities included in this operation: activity:test_dat_a@\myPVob vonc "test_dat_a" Trivial merge: "M:\vonc_test_dat_b\adev\test\aFile.txt" is same as base "M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\Test_DAT_A\2". Copying "M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\Test_DAT_A\3" to output file. Deliver has merged M:\vonc_test_dat_a\adev\test>ct deliver -target Test_DAT_B@\myPVob -cact -complete -force M:\vonc_test_dat_a\adev\test>ct co -nc aFile.txt M:\vonc_test_dat_a\adev\test>echo change first line>aFile.txt M:\vonc_test_dat_a\adev\test>ct ci -nc aFile.txt M:\vonc_test_dat_a\adev\test>type aFile.txt change first line M:\vonc_test_dat_a\adev\test>ct deliver -force M:\vonc_test_dat_a\adev\test>ct deliver -force -complete M:\vonc_test_dat_a\adev\test>ct mkbl -comp ADV_TST@\myPVob -view vonc_test_dat_int TST_DAT1.2.0 M:\vonc_test_dat_b\adev\test>ct rebase -bas TST_DAT1.2.0 Advancing to baseline "TST_DAT1.2.0" of component "ADV_TST" Updating rebase view's config spec... Creating integration activity... Setting integration activity... Merging files... Checked out "M:\vonc_test_dat_b\adev\test\aFile.txt" from version "\main\Test_DAT_Int\Test_DAT_B\3". Attached activity: activity:rebase.Test_DAT_B.20090707.163300@\myPVob "rebase Test_DAT_B on 07/07/09 4:33:00 PM." Needs Merge "M:\vonc_test_dat_b\adev\test\aFile.txt" [to \main\Test_DAT_Int\Test_DAT_B\CHECKEDOUT from \main\Test_DAT_Int\4 base \main\T est_DAT_Int\3] ******************************** <<< file 1: M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\3 >>> file 2: M:\vonc_test_dat_b\adev\test\aFile.txt@@\main\Test_DAT_Int\4 >>> file 3: M:\vonc_test_dat_b\adev\test\aFile.txt ******************************** ---------[changed 1-4 file 1]----------|---------[changed to 1 file 2]--------- first line done on Int | change first line Second line from Int |- Addition by A to be delivered to B fir+| Modification by A to be delivered to I+| -| *** Automatic: Applying CHANGE from file 2 [line 1] ============ ============ -----------[after 4 file 1]------------|----------[inserted 5 file 3]---------- -| modif by A to B |- Do you want the INSERTION made in file 3? [yes] no ============ ============ Output of merge is in "M:\vonc_test_dat_b\adev\test\aFile.txt". Recorded merge of "M:\vonc_test_dat_b\adev\test\aFile.txt". Build and test are necessary to ensure that any merges and configuration changes were completed correctly. When build and test are confirmed, run "cleartool rebase -complete".