Merge error: TF14087 "Not all of the deletion is being undeleted"  
Author Message
mtower





PostPosted: Team Foundation Server - Version Control, Merge error: TF14087 "Not all of the deletion is being undeleted" Top

When trying to merge from one line to another, I receive the following error:

TF14087: Cannot undelete '$/TFProject/TargetBranch/VSProject/SubFolder/File.aspx.resx' because not all of the deletion is being undeleted.

With the Show deleted items in Source Control option on, I've checked for deleted items in both the source and target directory so I don't see what is not being 'undeleted' so I'm not sure what I can do to allow the merge to happen.

Any help would be appreciated. Thanks.

Marty



Visual Studio Team System1  
 
 
Richard Berg MSFT





PostPosted: Team Foundation Server - Version Control, Merge error: TF14087 "Not all of the deletion is being undeleted" Top

Are you saying File.aspx.resx is not deleted in the target branch Can
you clarify what operations have happened since the last catchup merge

 
 
mtower





PostPosted: Team Foundation Server - Version Control, Merge error: TF14087 "Not all of the deletion is being undeleted" Top

Hi Richard,

Thanks for getting back to me. I think that I may have figured out my problem. The file and containing folder had been deleted and then re-added in the target branch; only instead of using the 'undelete' option, I did it through solution explorer. So there was a folder and file to 'undelete'; I just wasn't seeing it because a second folder with the same name had been added to the solution as well. Once I renamed the second folder in the target, I could see the original one that had been deleted and I could then do the merge.

But this all came about in my attempt to resolve a file name collision that I kept getting when merging to the target. I tried to fix the problem by deleting the directory in the target hoping that I could then merge in the directory in from the source. Obviously, that wasn't the best way to do it. Any thoughts on what I should have done instead

Marty


 
 
Richard Berg MSFT





PostPosted: Team Foundation Server - Version Control, Merge error: TF14087 "Not all of the deletion is being undeleted" Top

If you choose "merge changes for me" (AcceptMerge) in the Resolve UI for
a namespace collision, it should give you the Choose Name dialog. It
lets you decide whether to use the src name, keep the tgt name, or type
a new name.


 
 
mtower





PostPosted: Team Foundation Server - Version Control, Merge error: TF14087 "Not all of the deletion is being undeleted" Top

It's actually when I'm trying to check in my changes after a merge that I get the filename collision conflict window. When I do my only resolution choices are Ignore Conflict or Undo Local Changes. I've found that I can only continue with my check in if I undo my local changes but then I run into the same problem with the same file the next time that I merge.
 
 
Richard Berg MSFT





PostPosted: Team Foundation Server - Version Control, Merge error: TF14087 "Not all of the deletion is being undeleted" Top

You're right, the dialog I'm thinking of is only used for rename-rename
conflicts. Merge doesn't detect namespace conflicts.

What I'd do is rename (or delete) the file & checkin before doing the
merge, assuming the item in the source branch is the one you want to
keep. If not, undo like you did and checkin, then do the same thing in
reverse: rename (or delete) the item in source, the merge from target to
source.