活动已交付，因为其中的文件夹已交付。有什么补救办法？ [英] Activity becomes undeliverable as folder in it was delivered. What could be the remedy?

问题描述

我们的项目中有2个开发流和一个集成流。

We are having 2 development stream and an integration stream in our project.

以下是流

      ProjName-Int-Stream
      Bangalore-Dev-Team
      Madurai-Dev-Team

Bangalore-Dev-Team成员删除了一个文件夹并创建了一个具有相同名称的新文件夹（取消目录并创建了该文件夹）。然后他向其中添加了更多文件，并将其传送到集成流中。

Bangalore-Dev-Team member deleted a folder and created a new folder with the same name(Uncataloged the folder and created the same). Then he added more files into it and delivered it to integration stream.

Madurai团队成员正在同一个文件夹中工作，并且没有意识到Bangalore成员已将其删除。现在，他即将进行更改时未列出他的活动。

Madurai team member was working in the same folder and unaware that Bangalore member deleted it. Now his activity is not listed while he is about to deliver his changes.

有人遇到这种情况吗？如果是这样，您作为补救措施做了什么，以及如何防止它发生？

Has any one faced this scenario? If so what did you do as remedy action and how did you prevent it from happening ?

推荐答案

是的，这些被称为 邪恶双胞胎 （请参阅此处的示例：创建了两个元素（此处为目录），即添加到源代码管理 两次，这意味着它们具有不同的oid

Yes, those are called evil twins (see an example here: two elements -- here a directory -- created, that is "add to source control" twice, meaning they have different oid.

如果该目录的历史记录不太重要，最简单的前进方式是 Madurai 团队执行以下操作：

If the history of that directory isn't too important, the easiest way to go forward is for Madurai team to:

• 首先重新设置基础


• 接受中目录的版本在重新设置基准期间，班加罗尔（他自己的文件将消失）


• 重做其对由 Bangalore


• 交付

• rebase first
• accept the version of directory from Bangalore during the rebase (his own file will disappear)
• redo its works on the files as newly created by Bangalore
• deliver

另一个（更清洁的）选项用于班加罗尔到：

The other (cleaner) option would be for Bengalore to:

• 恢复已删除目录 D 及其原始内容。这样做的方法是：
  
  
  
  
  • 显示 D的 父目录的版本树
  
  
  • 在该版本树中查找仍引用 D的先前版本（在当前最新版本之间进行 与另一个版本比较父目录和版本树中的先前版本）
  
  
  • 右键单击该先前版本（stil引用 D并选择 merge到，请单击到当前版本（它会要求您签出）
  
  
  • 选择图形合并，然后在合并窗口中选择正确的 D版本（即来自旧版本的版本，而不是重新创建的版本）
  
  
  • 签入父目录
  
  
  • restore removed directory "D" with its original content. The way you do that is by:
    • display the version tree of the parent directory of "D"
    • look for the previous version in that version tree which still referenced "D" in it (do some "compare with another version" between the current latest version of that parent directory and a previous version in the version tree)
    • right-click on that previous version (the one which stil references "D" and select "merge to", click to the current version (it will ask you to check out it)
    • select a graphical merge, and then, in the merge window, select the right version of the "D" (ie the one coming from the older version instead of the one re-created)
    • check-in the parent directory

    如果 Bangalore 在单个活动中进行了修改，他还可以取消该活动，此操作更简单。
    -在（现在再次存在）目录 D 中进行修改
    -重新交付
    -然后 Madurai 调整基础并交付

    If Bangalore did his modifications in a single activity, he could also reverse that activity, which is simpler to do. - do the modifications in the (now present again) directory "D" - deliver again - then Madurai rebases, and delivers too

    这篇关于活动已交付，因为其中的文件夹已交付。有什么补救办法？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！