Hi, another option would be the following:
· Upload the new version to a different folder from the 1.0.0 · Perform a baseless merge between the new version and the 1.0.0. From the command line: tf merge /baseless <path to the new version> <path to 1.0.0>. More info: http://msdn.microsoft.com/en-us/library/bd6dxhfy.aspx · From that point, folders should remain bound with a branch relationship, and you should be able to perform further merges from the IDE I believe that this keeps the history as well, but I've not had the opportunity to test it. Best regards From: oztfs-boun...@oztfs.com [mailto:oztfs-boun...@oztfs.com] On Behalf Of Stephen Godbold Sent: sábado, 22 de enero de 2011 3:11 To: ozTFS Subject: RE: TFS 2010 & Code Drop from an external org. Hi Michael, The only way I envision you being able to keep both the original project, and a sembelance of the history is to use a replay mechanism such as the integration platform<http://tfsintegration.codeplex.com/>. This is a lossy transfer, so you won't get complete parity between the original changesets and those on your server. Unfortunately there's not really a good answer here, and I'd suggest that the approach you're taking is close to the best option in your particular scenario. Cheers, Steve. Stephen Godbold Senior Consultant | Readify<http://readify.net/> | Microsoft MVP - VS ALM<https://mvp.support.microsoft.com/profile/Stephen.Godbold> | Visual Studio ALM Ranger<http://msdn.microsoft.com/en-us/vstudio/ee358786.aspx> M: +61 409 390 683 | C: stephen.godb...@readify.net<mailto:stephen.godb...@readify.net> ________________________________ From: oztfs-boun...@oztfs.com [oztfs-boun...@oztfs.com] On Behalf Of Michael J. O'Donnell [M.O'donne...@epa.ie] Sent: Saturday, 22 January 2011 2:27 AM To: oztfs@oztfs.com Subject: TFS 2010 & Code Drop from an external org. Hi I got handed the code (Version 1.0.0) for a new project by an external vendor which I added to Team Foundation Server 2010. Again recent, the vendor handed over another version of the code (Version 1.0.1) which I want to save into TFS 2010 and effectively merge with the Version 1.0.0. Not sure what is the best way to proceed with doing this. One option that I was considering was to Branch the existing code base, and to do a copy paste of all the files into the branch folder. Once I'd copied in all the files, I'd do a merge with Version 1.0.0. I've tried to do this with one (of eight) of the projects in the solution but I'm not getting version history for the checked in files. Is there a better way to do this? Regards Michael. Michael J. O'Donnell | Environmental Protection Agency | Tel. 053 916 0671 | ext. 6271 ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the EPA postmaster - postmas...@epa.ie<mailto:postmas...@epa.ie> The opinions contained within are personal to the sender and do not necessarily reflect the policy of the Environmental Protection Agency. ********************************************************************** ______________________________________________________________________ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email ______________________________________________________________________
_______________________________________________ oztfs mailing list oztfs@oztfs.com http://prdlxvm0001.codify.net/mailman/listinfo/oztfs
