How to 'combine' histories of two files (one being the older 'version' of the other one)

Question

I basically have what's a poor-man's versioning...

• At one point someone copied / renamed the 'file.cs' to 'old-file.cs' - and all its history up to that point going with it.
• And then created a new 'file.cs' - with all the new history going forward.

I ended up with the same file having history split up in between these two files.

I know this must be simple (if possible),
- I've tried searching, but my problem is how to 'phrase the question'
- This isn't a 'merge' (I think - I don't have branches involved),
- It's not the typical 'move' either
- I've looked up the tf command line but nothing resembles what I need
- I have the TFS Source Control Explorer Extension installed (but it can't really help with this)

FWIW, I'm using the VS 2015, C# project (both files are part of the same project), though I don't mind if the solution is command line 'tf' or whatever gets the job done.

So if anyone could help point me to the right direction at least it would be much appreciated. Thanks!

Answer 1

I have tested with TFS 2015.3 + VS 2015.3, but couldn't reproduce your scenario. In my test, the history in old file has been migrated to new file. You may check my steps to see whether they are the same as yours:

1. Rename a file gulpfile.js to old-gulpfile.js, and check it in in Source Control Explorer. Then copy old-gulpfile.js in workspace and modify it to gulpfile.js, and add it to source control and check it in.

2. Check old-gulpfile.js history:

3. Check gulpfile.js history:

You can see all history in old-gulpfile.js is also in new gulpfile.js file.