New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
RevFile: Diff any two files #8275
RevFile: Diff any two files #8275
Conversation
Codecov Report
@@ Coverage Diff @@
## master #8275 +/- ##
==========================================
- Coverage 52.80% 52.78% -0.03%
==========================================
Files 857 857
Lines 62305 62339 +34
Branches 11190 11202 +12
==========================================
+ Hits 32900 32904 +4
- Misses 26799 26827 +28
- Partials 2606 2608 +2
|
I'm getting concerned with the size of our context menus. |
RevFileTree is not that long, should not be a concern. |
Intentional. If you select a commit, then work tree, Git can compare. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Handling posix paths. When @mstv has approved I will squash (probably keep difftool in folder separate) and rebase, then merge |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you
9f7f127
to
7dc6e97
Compare
@msftbot merge in 24 hours |
Hello @gerhardol! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
Based on #8193, for RevisionFileHistory
Proposed changes
Add Remember file for diff for RevisionFileHistory similar to RevDiff in #8193 The context is shared between the tabs
Screenshots
Before
After
Test methodology
Tests added for RevisionDiff
✒️ I contribute this code under The Developer Certificate of Origin.