Date: Thu, 10 Nov 2022 16:26:52 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 267696] textproc/tkdiff: update 4.3 --> 5.0 Message-ID: <bug-267696-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D267696 Bug ID: 267696 Summary: textproc/tkdiff: update 4.3 --> 5.0 Product: Ports & Packages Version: Latest Hardware: Any OS: Any Status: New Keywords: dogfood, easy, patch, patch-ready Severity: Affects Some People Priority: --- Component: Individual Port(s) Assignee: ports-bugs@FreeBSD.org Reporter: portmaster@bsdforge.com Attachment #238002 maintainer-approval+ Flags: Flags: maintainer-feedback+, merge-quarterly? Created attachment 238002 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D238002&action= =3Dedit 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/downlo= ad That's it. Thanks! :-) --Chris --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-267696-7788>