Activity for Duncan Roe
-
Duncan Roe created ticket #93
Main screen comparison highlighting disagreees with current line
-
tkdiff needlessly obeys 2 blank lines as custom code after save prefs
-
@vampm also explained that by having Dbg take an arg in braces, the interpreter doesn't need to expand the arg when debugging is off. Neat.
-
@vampm also explained that bu having Dbg take an arg in braces, the interpreter doesn't need to expand the arg when debugging is off. Neat.
-
Scrub this: I should have used braces: @@ -1053,6 +1053,7 @@ ############################################################################### proc run-command {cmd {out {}}} { global ASYNc errorCode + Dbg {runcmd cmd=$cmd; out=$out} # Arrange for requested output format (given execution constraints) # N.B> 'fout' will become one of: a channel, a cmd indirection, or empty. A bit counter-intuitive perhaps, but it works. Also @vampm emailed me this: FYI - there is another way you COULD have watched what...
-
tkdiff -d suggested improvements
-
Agreed
-
The patch below fixed it for me. But you are right about the others: tkdiff failed for me in a clean git repository. I found a CVS repo where cvs diff worked and tkdiff failed there as well. So the attached patch fixes all 3. --- tkdiff 2022/08/29 02:46:16 1.6 +++ tkdiff 2022/08/29 04:07:07 1.7 @@ -3175,6 +3175,7 @@ # rev is what we will tell svn cat to access # cmit is how we express the range to 'svn diff' set cmit(2) [set rev(2) ""] + set MSG [set msg {}] if {$revs == 0} { # Sets up BASE -> WC...
-
w.r.t. tildechk, sure, you could remove the Dbg. The flows look OK to me: Err is either set in the block starting if {$g(conflictset)} or inside the associated else block, within the block starting if {$N <= $pths} which is always false since $pths is 0, and which sets tildechk. So the later line if {$Err} { set msg $tildechk can only fire when tildechk exists. The Dbg is outside the block starting if {$N <= $pths} so tildechk may or may not exist.
-
The change from an ORlogic to ANDlogic affects code which is new at 5.5. Looks to me like a simple typo: there is no way you want to be in that code with an SCM other than Vpath.
-
w.r.t. tildechk, sure, you could remove the Dbg. The flows look OK to me: Err is either set in the block starting if {$g(conflictset)} or inside the associated else block, within the block starting if {$N <= $pths} which is always false since $pths is 0, which sets tildechk. So the later line if {$Err} { set msg $tildechk can only fire when tildechk exists. The Dbg is outside the block starting if {$N <= $pths} so tildechk may or may not exist.
-
While I think this fix is correct (in that revs should not be decremented), plain tkdiff still fails at inquire-svn line 97 with define autoSrch {1} in .tkdiffrc. Will investigate further. A mistaken tkdiff -v (hoping to see version number) also fails the same way.
-
tkdiff -rREV1 crashes
-
tkdiff fails to highlight in-line changed characters
-
The patch actually fixes 2 errors: --- tkdiff 2022/08/15 03:29:49 1.1 +++ tkdiff 2022/08/17 10:36:46 @@ -930,7 +930,7 @@ # (maintaining the evolutionary chain) if {[info exists "prefsFileVersion"]} { set opts(prefsVrsn) $prefsFileVersion - unset $prefsFileVersion + unset prefsFileVersion } # 3rd (PERMANENT location of the 'File Version') @@ -953,7 +953,9 @@ # "ignoreRegexLn" and "ignoreEmptyLn" became bit-Based booleans. # 4. "diffcmd" is now DERIVED (as opposed to user-SET) thus will be # rewritten...
-
tkdiff crashes on startup with a 4.3 .tkdiff
-
I tried deleting ~/.tkdiffrc and tkdiff 5.5 (from SourceForge) started up OK
-
Add sage-bin
-
-
VOTE: tcl
-
Thanks Michael - all clear now
-
Can you confirm that your description explains the line discrepancy on comparing q.c.old / q.c.new attached? There is no padding, unless you count the odd blank line
-
Above is 4.3.5
-
Can you confirm that your description explains the line discrepancy on comparink q.c.old / q.c.new attached? There is no padding, unless you count the odd blank line
-
Hi Michael you are correct. It was not 4-3-5: I just tried that and the problem is gone. Sorry for the noise. Cheers ... Duncan.
-
Display freezes after View -> Ignore White Spaces
-
Verified against latest download. File a is a b c d e f and file b is a b d e f Despite deleting c, lines d,e &f still show with same line number (screenshot attached)
-
Line numbers go wrong if delete line before blank line
-
VOTE:usm
-
The link from Issue#35 points to August although it claims to point to September
-
If not at top level of git tree, tkdiff reports "File xxx is not part of a revision control system"
-
Forgot to mention - the process creates files with a .d suffix, so clean is patched...
-
makedepend throws lots of errors - can we use gcc -MM please
-
I suggest x11basic has to stop on receiving EOF. Python does that, as does expect,...
-
consolefont.c and consolefont.h are not in source tarball
-
Ctrl-D (EOF) causes seg fault
1
