Activity becomes undeliverable as folder in it was delivered. What could be the remedy?

问题

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

Following are the streams

      ProjName-Int-Stream
      Bangalore-Dev-Team
      Madurai-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 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 ?

回答1:

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.

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

• 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:

• 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

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

来源：https://stackoverflow.com/questions/9799531/activity-becomes-undeliverable-as-folder-in-it-was-delivered-what-could-be-the