From nobody Thu Nov 10 16:26:52 2022 X-Original-To: ports-bugs@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N7S0D4k2dz4dGGM for ; Thu, 10 Nov 2022 16:26:52 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N7S0D2WhYz3N0s for ; Thu, 10 Nov 2022 16:26:52 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668097612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LdqAzzlWWKZPA03gUjH/az5Dc3YHjPg7zc9wo7VtOjI=; b=YvwbDp2vdAMALhDk9xF/pseqFNAF+Vl9zCEGipxaPMQl38L8oR6/+QhV1VG1Pvs9EmPFmW fupD4GzsBjoRzA88J61FBRFjzSfTPoMXjJ8olrcK3wcck1dKm4L6yuQ2FZ7jx4/4CEkqjL pGdeR9Sh1Uxtvl4xcmbUwo1K0rIS1KiSbRPJDeqxymxyf/o4NRvY0KkXdQ1aezMxOUug41 2MTwgOZuYQzK0CuiSiYqXi41h04CzVSxT4ltn/p5T9FinFItwulmdDuiTZwzVy89RFkagz i27EvWgj9l+1CzI4jSeCYRrIYUc8ieYM+smlc9HFy3UAGHNH1rVGYKVXOEs66w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668097612; a=rsa-sha256; cv=none; b=yVbajlMjM6RoUy0I/4uOmPkpLV1pMO95wJO0lcn3Pm3RGJw93Di6cecZhl2QejJFHxNYAw Qqe+wgo5Srzs8PcdLWRWiTlaIDOFG3Nxg7MgMF6ioZujeeXOSKbu8J9BKlxGUa4/9MR15b JQF8URYvqGtE6PWLdmMQrv2BKG7bxzk8d3vQ/Xx/cnSoDUtXVvtPkDzFxa3PGemxncjzP2 HTFcr0YiZdKJ+1Pg5Hz1xCTPy/kqjASiYwbzmKbFFqrhRSGgw1qKcBF+ourqDcj5/9Gd0k CQALg1tJjdj98bxJrswEHD1SrI8e14jRZPJCOm/weFn/+ZJbOoEWoqaRP79s6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N7S0D1PXvz179H for ; Thu, 10 Nov 2022 16:26:52 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 2AAGQqG9051279 for ; Thu, 10 Nov 2022 16:26:52 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 2AAGQqpH051278 for ports-bugs@FreeBSD.org; Thu, 10 Nov 2022 16:26:52 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 267696] textproc/tkdiff: update 4.3 --> 5.0 Date: Thu, 10 Nov 2022 16:26:52 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: dogfood, easy, patch, patch-ready X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: portmaster@bsdforge.com X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: ports-bugs@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback+ merge-quarterly? X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status keywords bug_severity priority component assigned_to reporter flagtypes.name attachments.created Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Ports bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-ports-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports-bugs@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N 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.=