Menu

Code Commit Log


Commit Date  
[r144] by vampm

* The NewDiff interactive Dialog is now the default when no args given
- it permits a simpler startup on graphical desktops via shortcuts
- yet still allows dynamic searching for SCM-based diff candidates, and
- its controls are now inter-related to assist making correct settings
* Users may now specify a preferred SCM system among those detectable
* Additionally, the SCM system may be manually selected during dialog use
* A new autoSrch preference allows immediate SCM startup from the cmdline
* It is now possible to COMBINE usage of two distinct SCMs, if desired;
- this also facilitates comparisons between distinct branches of an SCM
* It is now possible to request a "conflict" diff via the dialog
* Conflict parsing now accepts a diff3-like format (but only as a 2way)
* The (internal) setting of prefs is now managed to prevent lost settings
* Resolved a race condition causing instability in redrawing the DiffMap
* More uniformity of error messaging - particularly fatal errors
* New Help info on the role of the CWD during tool startup, plus the SCM
- features, and interpreting the interactive feedback from the dialog

2018-08-31 02:19:20 Tree
[r143] by dorothyr

Add inquire-cvs proc so tkdiff with no arguments queries cvs for modified files to load, like git and svn

2018-08-17 17:47:35 Tree
[r142] by vampm

* Added ability to recognize 3way mode is active and view the Ancestor file
* Builtin editor now provides Line numbers for displayed files

2018-08-05 19:49:15 Tree
[r141] by vampm

Provide clear feedback when a three-way merge is in effect

2018-08-04 18:29:59 Tree
[r140] by vampm

Fix minor graphic feedback artifacts (particularly w/zero hunks) when doing a new Diff

2018-08-02 18:23:44 Tree
[r139] by vampm

Repaired internal variable renaming oversight (1 instance)

2018-08-01 23:56:40 Tree
[r138] by dorothyr

Use is-git-repository instead of is-repo-dir in proc scm_detect, because presence of a .git directory is only one possibility

2018-08-01 20:43:01 Tree
[r137] by vampm

* Further improved newDiff dialog now permits browsing to an Ancestor file
- additionally it can be specified as a SCM revision instance, perhaps
- from distinct branches (presuming each WC knows the branch it represents)
* Now accepts entering 2 FileSpec + 2 Revisions where Filespecs are NOT the
- same allowing comparisons of distinct branches (for branch sensitive WCs)
* 3way collisions now highlight within the dropdown list (a location aid)
* The GUI txtwin labels now tooltip the REAL filename+modtimes (no tmpfils)
* MacOS X prevented from using ASYNC due to Aqua non-support for msg window
* Fixed missing usage of CDR-specific preferences within all Info displays
* Updated help on new input formats, 3way strategies, and PWD implications

2018-08-01 18:25:14 Tree
[r136] by vampm

* Improved newDiff dialog now permits browsing to Files OR Directories
- additionally it and browsers now stack above each other properly
- And now agrees w/help stating that "More" options UNSET when closed
* Repaired crash when Lnum/Chgbar are both OFF and 3way diff is/has run
* Map color pref chgs now WORK in the current session (besides 'save')
* All Info canvases now use 'currtag' prefs as intended (was ignoring)
* Transparent (internal) conversions to recent (Tcl8.5) coding techniques
- use of 'lassign' instead of 'foreach ... {}' hack
- use of 'apply' to manufacture anonymous event handler
- greater use of '{*}' list expansion style instead of 'eval'
* minor typos, safer internal constructs, consolidations, plus more uniformity

2018-07-28 15:39:55 Tree
[r135] by vampm

forgot to commit the Changelog

2018-07-21 19:28:47 Tree
Older >
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.