search

microsoft / vscode

Visual Studio Code
https://code.visualstudio.com
MIT License
162.17k stars 28.54k forks source link

Timeline produces confusing results on with merged branch #101550

Open roblourens opened 4 years ago

roblourens commented 4 years ago

I just merged a branch into another branch, then looked at a change in the Timeline view. I was confused that it shows a diff that doesn't match what that commit should have had, but I think it makes sense if it is diffing that version of the file with the previous commit that shows in the flattened view in the Timeline. (where the previous commit is not actually the parent commit of the one I'm looking at). If I look at the commit history in gitlens and look at that commit/file, I see the expected diff. Is that by design?

roblourens commented 4 years ago

This is the change I'm looking at https://github.com/microsoft/vscode-node-debug2/commit/bb1b22bbf75c3f057b9b5a19671091752ea6b66e