DiffFinder
DiffFinder (from rajeevboobna / shelvesetcomparer) extends the existing hamidshahid / shelvesetcomparer Visual Studio extension. ShelvesetComparer is a Visual Studio extension that allow users to compare contents of two shelvesets (from on or different users).
DiffFinder extends it to also
- allow comparison of a shelveset with current workspace local pending changes
- compare shelvesets targeting different branches, e.g.
$/BranchA/path/to/file1with$/BranchB/path/to/file1
Color coding used in file comparison:
- black: no difference / both files are identical
- red: differences / both files differ
- blue: file exists only in one of the compared containers (Shelveset or Pending Changes)
VisualStudio Marketplace
- DiffFinder for VS2022
- DiffFinder for VS2019
- ShelvesetComparer:
- Previous versions:
Examples
-
Open Shelveset selection from TeamExplorer:
-
Select two Shelvesets for comparison or one Shelvesets to compare with current Pending Changes:
-
File comparison view comparing two Shelvesets:
-
Shelvesets with same file paths (same branch):
-
Shelvesets with different paths (algorithm tries to find the best match (most common path parts)):
-
differerent branches but same relative path:
-
different branches and different paths:
-
-
Branches and tags
- DiffFinder (remote / difffinder: https://github.com/rajeevboobna/shelvesetcomparer)
main/master: equivalent to latest releases/ branchreleases/*: release branches for corresponding VS version- Release tags:
DiffFinder-vN.N.N.N
- ShelvesetComparer (remote / upstream: https://github.com/hamidshahid/shelvesetcomparer)
SC/*: ShelvesetComparer branches with same logic as for DiffFinder- Release tags:
vN.N.N.N