Solved

upload changes to team foundation server

Posted on 2014-01-08
10
496 Views
Last Modified: 2014-01-10
Experts:

I've been asked to make some changes to a production project in VS 2012. the changes are quite basic, but i'm having trouble using VS 2012 integrated into Team Foundation Server 2010. unfortunately the developer who configured the environment has left and I'm carefully attempting to pick up where he has left off.

I've download the code locally and have created a sprint for the change. when i check in and merge the changes back to the trunk, it updates error free. but the updates are all local to my PC. when i view the source of my modified file from TFS it has the old content. how do i merge these changes to the production environment?

complete TFS newbie here if you can't tell and been so long since I used VS i need a good refresher as well. thanks in advance for your help.
0
Comment
Question by:telliot79
  • 5
  • 4
10 Comments
 

Author Comment

by:telliot79
ID: 39768493
further to my questions, I think I may have found the problem.

when i'm making changes to the project I check the changes in, and then merge them to my trunk. i also need to check my trunk in. This makes sense. is this the correct process?

what's throwing me off is when i look at the contents of the file in TFS it shows the original file, not the changes I've made. When I go to the compare tab I can chose my latest changeset and see the changes I've made there. am I doing something wrong?
0
 
LVL 96

Expert Comment

by:Bob Learned
ID: 39768627
What does your TFS project hierarchy look like?

Is the main trunk what you call production?

How are you merging changes?
0
 

Author Comment

by:telliot79
ID: 39768877
i've uploaded a snippet of the hierarchy.

yes, the main trunk is production.

I'm merging the changes by first checking the files in in the branch I'm working on, then right clicking the files, selecting Branching and Merging > merge. I then merge back to the trunk and have to check the changes in at the trunk as well.

once they are checked into the trunk, they appear to be uploaded to TFS but the content doesn't show this unless i do a comparison.
tfs-hierarchy.gif
0
3 Use Cases for Connected Systems

Our Dev teams are like yours. They’re continually cranking out code for new features/bugs fixes, testing, deploying, testing some more, responding to production monitoring events and more. It’s complex. So, we thought you’d like to see what’s working for us.

 
LVL 96

Expert Comment

by:Bob Learned
ID: 39768998
"once they are checked into the trunk, they appear to be uploaded to TFS but the content doesn't show this unless i do a comparison."

I don't understand this step, and what you mean exactly...
0
 

Author Comment

by:telliot79
ID: 39769161
I check the changes in from the branch I'm working on, then merge them to the Trunk. Then I have to browse to the trunk in source countrol and check the same files in again. They appear to check into TFS at the trunk but when I look at the code from TFS it doesn't give me my latest changes.

does that make sense?
0
 
LVL 96

Expert Comment

by:Bob Learned
ID: 39769288
Where are you looking for changes?  Are you looking at local files or viewing from Source Explorer?
0
 

Author Comment

by:telliot79
ID: 39769339
on the contents menu of the TFS site. See the attached file for reference.
tfs-menu.gif
0
 
LVL 96

Assisted Solution

by:Bob Learned
Bob Learned earned 175 total points
ID: 39770019
You and I use TFS in a different way.  I have never had any reason to use the web site, so I can't comment on that.  I do all of my work in the Source Control explorer, and with the Visual Studio options.
0
 
LVL 33

Accepted Solution

by:
sarabande earned 325 total points
ID: 39770357
you may consider not to working on an own branch but use the main trunk instead.

to do so, you could use your current workspace. you should use the Source Control  Explorer and not the web interface as told by TheLearnedOne. the Source Control  Explorer can be found in Visual Studio when you go to the Team Explorer tab. then the entry 'Source Control' in the Team Explorer tree (last entry)  would open the Source Control  Explorer.

in the explorer you can navigate to the root folder of the main trunk and 'get the latest sources' from there. these sources would go into a different local folder which probably is at same (folder) level than your current branch. after that you could check-out/check-in directly from/to main trunk without merging.

note, you also could go the way you did so far. but then you would need to 'merge' all your changesets from the branch to the main trunk what is an additional step which could help with synchronization if many developers are working with the same sources but also could generate new problems.

Sara
0
 

Author Closing Comment

by:telliot79
ID: 39770959
Thank you both for your answers. Since I'm just working with TFS and am rusty in VS both sets of comments have been helpful and given me an idea of what I may be doing wrong with these tools.
0

Featured Post

DevOps Toolchain Recommendations

Read this Gartner Research Note and discover how your IT organization can automate and optimize DevOps processes using a toolchain architecture.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

This article will show, step by step, how to integrate R code into a R Sweave document
Whether you’re a college noob or a soon-to-be pro, these tips are sure to help you in your journey to becoming a programming ninja and stand out from the crowd.
An introduction to basic programming syntax in Java by creating a simple program. Viewers can follow the tutorial as they create their first class in Java. Definitions and explanations about each element are given to help prepare viewers for future …
In this seventh video of the Xpdf series, we discuss and demonstrate the PDFfonts utility, which lists all the fonts used in a PDF file. It does this via a command line interface, making it suitable for use in programs, scripts, batch files — any pl…

786 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question