Created attachment 238002 [details] git diff to update ttextproc/tkdiff ftom 4.3 to 5.0 Update textproc/tkdiff from version 4.3 to 5.0 Brief summary of changes: V 5.0 * New-Diff Dialog can now request Conflict file comparisons - It also permits choosing a preferred SCM system from among those - detected, and is now ALWAYS the defaulted first operation when - NO command line arguments are given - UNLESS one specific user - preference has PREVIOUSLY been set which requests that the SCM - inquire for currently uncommitted changes and supply those as - parameters instead (not all SCMs can do this). For those that do, - that search request may ALSO be accessed for the current session - via the Dialog, even when such preference has been set to Off. * CVS (like Git and Subversion) is now capable of automatic inquiry * ALL SCMs capable of inquiry also pass CONFLICTED files when found * URLs (Svn style) are now accepted as FileSpecs in Dialog or Cmd use. - Including both versioned and defaulted styles, and as an Ancestor. * Multiple SCM involvement is now possible. * Merging when using an Ancestor file (ie. a 3-way diff) now provides - *Ancestral markers* for deletion activities, similar to those - already provided for additions, which also participate in both - automatic merge selection choices AND collision detection, all in - support of assuring that COMPLETE changes from both files being - merged are accounted for. * Upgraded Conflictfile parsing to accept **diff3**-style file content - providing the ability to treat it as in a 3-way Diff mode. * Interactive diff-region suppression (ie. ignoring) is now possible * Eliminated a TK-update race condition that was randomly responsible - for odd crashes and potentially inconsistent screen updates * Minor feature enhancements: - Window manager is now provided a graphic to represent TkDiff - **Displayed** file NAMES now *try* to be shorter by truncating the CWD - Failed (or inconsistent) Diff executions are no longer **fatal** - 3-way Diffs using a non-unique Ancestor now simply drops 3-way mode * Small repairs involving: line numbering; Mac tooltip rendering; - several hilighting anomolies involving *suppressed* Diff regions; - and missing bindings when positioned over various Text-adjacent - Info windows involving scroll operations. Lastly, filenames with - *sensitive* characters (Dollar, square-Bracket) in their names - will no longer crash, and the default setting for Filebrowser - view-content filters is now specified properly. * And the builtin Help is updated to cover aspects of ALL the changes https://sourceforge.net/projects/tkdiff/files/tkdiff/5.0/SFreadme.md/download That's it. Thanks! :-) --Chris
Latest version is 5.6, right? Is there a reason why you submit a two-year-old version? https://sourceforge.net/projects/tkdiff/files/tkdiff/5.6/
(In reply to Herbert J. Skuhra from comment #1) Yep. I've spent some time testing 5.0. So I *know* it works as intended. However, I haven't *yet* worked with the *latest* version. Once I've had a chance && time with it to know. I'll submit a patch for it. Make sense? :-) Thanks. --Chris
^Triage: Simplifying title ^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. Since we've had 4.3 for quite a long time, I don't think this qualifies to be backported to Q4. It is a major release, not a bugfix one. Thanks!
Add Changelog to URL field
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d7e907d9d1b000a1d94d362def20e66aef51e67 commit 6d7e907d9d1b000a1d94d362def20e66aef51e67 Author: Chris Hutchinson <portmaster@bsdforge.com> AuthorDate: 2022-11-15 12:18:26 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-11-17 06:58:15 +0000 textproc/tkdiff: update to 5.0 Resumed ChangeLog in the PR. PR: 267696 Reported by: portmaster@bsdforge.com (maintainer) textproc/tkdiff/Makefile | 7 ++++--- textproc/tkdiff/distinfo | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-)
Committed, Thanks!