How does TFs merge unchecked files across branches?

Last night, I had a nightmare. Ruined2A set of weapons, eat countless medicines and pills, and use up coins. Finally, Hua Xiong was killed.
At the same time, I also thought about how to transfer a large numberCodeA proper transfer method.

1.Get file list

FirstVSOpenPending changesWindow: View->Other windows->Pending changes
Select the text conditions to be transferred, and then clickShelve, EnterShelve Set NameAnd then removeRetain pending changes locallyOption, PointShelveConfirm.
Note that the local pending changes have been revoked.

 BackPending changesWindow, selectCancel Shelving, InCancel ShelvingWindowResultSelect the shelving set in the list and clickCancel ShelvingConfirm.

Now, the files that have been shelved are returned to the local machine.

 

Then, openOutputWindow: View->Output
InExplicit output belowSelectSource codeManagement-Team Foundation
You can see a string like:

Cancel$/Project/... /*.*Change Shelving

File List, cut all these lists to the text editor you are familiar with, remove the first and last parts, only keep the directory in the branch

For example, the orange part:

Cancel$/Project/sources-brch-0.0.62/Gameengine/FSM/State. cppChange Shelving

Cut the entire list and paste it for backup.

 

2.Merge code

Obtain the target branch to be transferred (it is recommended that you obtain the latest code to avoid merging multiple times)

UseBeyond compare 3Compare two branch directories.

InBeyond compareSelectFile Filters
Paste the file list on the clipboardInclude filesInternal
Beyond compareInternal SelectionShow no orphans,Only compare files

In this case, only all pending change files are listed.

Manually confirm and merge your modifications.Please note that you need to be very careful here!
Because yes2Code of different branches,BeyondcompareThe differences listed are not only the changes you need to make.
 

3.Check out target code

Create under the target codeCheckout. batFile, the content is as follows

Call "% vs80comntools % vsvars32.bat"

For/F "" % I in (Filelist.txt) Do TF checkout % I

CreateFilelist.txtThe content is the list of clipboard files.
Double-clickCheckout. batCheck out all the files in the list after running.
 

4.Last check-in

We suggest you try againReviewAll the files to be checked in.

 

Thank you for reading the entire process!
Kaikai