mbien opened a new pull request, #9128:
URL: https://github.com/apache/netbeans/pull/9128
Git history entries are not necessarily sortable by commit date which the
history tab currently uses as column sort order. (rebase may change commit
order, commits could in theory also have the same commit/author date etc)
This adds a position field to the fetched history entries which is now used
in the comparator instead of the date.
Comparisons between local and git history items still use timestamps.
reproducer:
1) init git repo with 3 commits: `INIT`, `B` and `A`
- (changes of `A` and `B` should not be in conflict so that commit order
can be easily changed)
2) rebase the last two commits and swap `B` with `A`
3) `git log` should show `INIT`, `A`, `B`, the NB file history tab will
show `INIT`, `B`, `A` which is not the correct log order
- note: the `git ->show history` action does always show the correct
order, this is about the history mutiview tab
This is a minimal attempt to resolve this issue. UI-wise we should probably
do more and swap the revision and date columns (and probably don't allow to
sort by date at all).
draft since i have to test this better and I might add a cleanup commit,
feedback still welcome
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
