I'm using TFS. On my branch I checked in a bunch of changes, that I now want to undo.
I can click on the branch in TFS Source Control, and view history, and get the original branch, but when I check it out to edit... it reverts back to the branch that I boned.
I tried both "View History" then right clicking on orignal "create" branch and then "get this version"
And I also tried right clicking on the branch and "Get Specific Version".
I also tried deleting the local files for this branch.
How do I just get the original version?
(Note: Deleting + Recreating the branch is a huge process so I'd like to stay away from that)
Depending on the version of TFS you're using and on whether you have the TFS power tools installed, you can either find it in the History Panel (under the Rollback item). You can always do it from the commandline using
tf.exe rollback
Related
I have 2 branches (A and B) and the situation looks as follows:
On branch B, for one file I clicked Get specific version and picked the first version of this file. I then switched to branch A to merge version from branch A to B but it tells me that there are no changes to be merged. When I click compare on both files there are many changes
After doing the "Get Specific version" you need to check out every file in the changeset manually (right-click, check-out). Be sure that you have the "Get latest on checkout" turned off.
After that perform a get latest, which will prompt you to merge. This is going to be a more tricky merge, since Visual Studio will assume that the newer version is what you want. When you're satisfied (you can keep local version), check in the code. Then merge branches.
You can also try "Get This Version" on the changeset. This is MUCH quicker than "Get Specific version" because you don't have to download the whole repo again.
Follow below steps to do that:
1) Go to Tools-->Options, select Source Control-->Visual Studio Team Foundation Server. Un-check 2 options shown below.
2) For the file you'd like to edit, select the file, right click and View History. In the history screen, select the version you would like to edit. Right click and select Get This Version.
3) In Solution Explorer, double click the file and it should open the version you selected in the History view.
4) Make your edits and Check-In. You will get a Resolve Conflicts screen. From there either Merge Changes In Merge Tool or select Keep Local Version to check in the file as is.
5) Merge branches.
Using VS2013 and/or VisualStudio.com, is it possible after creating a branch ("Main" branched to "Dev001") to view a list of all the files that differ between "Main" and "Dev001"?
For example, I'd like to see all the files that have been amended/created within the current branch, since it was branched.
The closest I have got is right-clicking the branch, selecting View History, then clicking each changeset to view the files in the Changeset Details panel, however, there are many changesets in there which is taking a long time.
Please note I am not using Git.
Just right click on your Main branch in Source Control Explorer an select Compare.... From there you can specify the path to your branch and the versions you would like to compare.
We use tfs2010 and vs2010.
Suppose I have two branches (make it simple):
Development
Main
I made some changes on development branch, checked in and merged to Main branch.
On development branch I have changeset with id 00001.
On main branch I have changesetid with 100001.
If I will history from Main branch, I can see a changeset 10001 with all the merged files (which is good).
However, is it possible to see that changeset 00001 is the ones that got merged from development to main branch?
I tried tfpt history followbranches, but tfpt doesn't have history command any more as it is moved to tf.
I then tried tf but tf history command doesn't have followbranches option at all.
Can someone help?
Many Thanks
In the history window of Main branch, Right Click on the Changeset (10001) and select "Track Changeset". After that select the Dev branch (in the Select Branches window) and then click the Visualize button at the bottom. You should see the window with the link between the Dev and Main changesets. You can view "Timeline Tracking" or "Hierarchy Tracking".
See below the link explaining it:
http://msdn.microsoft.com/en-us/library/dd405662.aspx
Scenario:
Checked in Dev branch
Want to Confirm weather Changeset is merged to QA Branch
Below is taken from Microsoft Docs.
To view the Tracking Changeset Window from the History window of a branch or file
In Source Control Explorer, click a branch or a folder or file that is contained by a branch.
Click the File menu, point to Source Control, and then click View History.
In the History window, right-click the changeset that you want to view, and click Track Changeset.
The Select Branches dialog box appears.
(Optional) In the Branches list, select or clear the check boxes for the branches that you want to show or hide.
As you select or clear check boxes, a preview of your selections appears on the right-hand side of the dialog box.
(Optional) If your team has a lot of branches, click the buttons above the preview to select the branches that you want more easily.
You can move the pointer over each button to get information about what the button does.
Click Visualize.
I have tried this in Visual Studio 2017.
Hope this helps.
So, we have our main dev line, I create a branch, and developer b creates a branch. We both do some work. developer b finishes his work, merges back into the main dev line. I know his changes will affect me, and rather than deal with the conflicts later, I would like to update my branch, with the changes that are now in the main dev line, so I can deal with them in my branch, prior to merging back into main.
How do I do that?
From Visual Studio, open Source Control Explorer:
View | Team Explorer
Select your Team Project from Team Explorer, expand it, and double click Source Control
In the left-hand pane of Source Control Explorer, select your Team Project.
In the right-hand pane, find your mainline branch, right-click and select Merge...
In the Target branch drop-down, select your dev branch.
If you want a subset of all the changes in the mainline:
Choose the Selected changesets radio button, click Next.
Select the changesets that represent the merge from your other dev's branch into main, click Next.
Otherwise, keep All changes up to a specific version selected, click Next
The next step has you pick a Version type. The default, Latest Version is obviously straightforward and self-explanatory: you would be brining all changes since your branch was created from the mainline down into your branch. The other choices are straightforward, but a tutorial explanation of each option available here would take a fair amount of space.
Walk through the remaining steps of the wizard.
Click Finish.
If there are any errors or merge conflicts, you will be prompted to resolve them, similar to what you would see if checking your changes into source control when other changes had been made since last checkout.
After the merge is done, all the changes are in your local copy of the branch, but they are not yet committed to source control. Once you've completed all your builds and testing on your branch, you can check in the merge. From Visual Studio:
View | Other WIndows | Pending Changes
Make sure all the files related to this merge are checked, add comments describing the merge, and click Check In.
I recommend keeping merges (and any necessary merge conflict resolution, build breaks, test breaks) as their own changeset. That is, do not mix other feature work with merges. Granular changesets make it much easier to review source control history, and to identify a single change of interest. Keeping merge work in its own changeset helps work toward that goal.
There is command-line for merging as well, run tf merge /? from a Visual Studio Command Prompt.
We have a setup with a development "trunk" in our recently-migrated-to-from-VSS TFS system and developers have been doing work in branches off the trunk, which are merged back in.
We've been diligently commenting our changesets at check in time, something we never did in the VSS days. However when I right-click on a trunk file in the Source Control Explorer and choose History, I only see monolithic changesets labeled "merge from dev branch" (or whatever the developer scribbled in there when they merged.) A history entry doesn't even seem to contain info on which branch was merged in at that time, let alone any info about the changesets that make it up, or the comments that go with them.
How have other TFS users dealt with this issue?
Is there another way to view the history that I'm missing here?
Looking at the history of a change prior to the merge has been a bit of a pain point with TFS. So much so that Microsoft have done a lot of work to address this in the next version of TFS (TFS 2010). In TFS 2010 (when it comes out), when you get to a merge in the history view it is actually a little twistie that you can expand and go see the history for the thing that was merged which is much nicer.
In the meantime, when I see I big monolithic merge (or branch) comment I tend to let out a audible sigh and then go find the file in the branch it was merged from in Source Control Explorer and do a view history there.
This might be what you are looking for: http://www.codeplex.com/TFSBranchHistory
Haven't used it personally, so I can't vouch for it.
Visit "TFS Branched History" plugin page at Microsoft Gallery:
http://visualstudiogallery.msdn.microsoft.com/7d4f37b6-f9a4-44c6-b0a0-994956538a44
Plugin does insert "Branched History" button into the context menu of Source Control Explorer (TFS)
The button icon is with clock like standard "History" but with blue arrow:
If you click "Branched History", new window will be opened and Path property will be set to the current Source Control Explorer path:
Click "Run query" to get results at the "History" tab:
From context menu you can query standard Changeset Details and Compare File (Folder) dialogs.