Share

tkdiff

Code

Programming Languages: Tcl

License: GNU General Public License (GPL)

Repositories

browse code, statistics, last commit on 2007-11-24 cvs -d:pserver:anonymous@tkdiff.cvs.sourceforge.net:/cvsroot/tkdiff login

cvs -z3 -d:pserver:anonymous@tkdiff.cvs.sourceforge.net:/cvsroot/tkdiff co -P modulename

Show:

What's happening?

  • Which color tags are available?

    I want to configure coloring preferences for my Tkdiff tool, but I'd like to get introduced to all available colors we can use. Does anyone know? Thanks!

    2009-08-06 12:15:43 UTC by alexandrebodi

  • Followup: RE: Problem on merge with common ancestor

    I have the same exact problem. There is no way to view the ancestor file! Please help!

    2009-06-09 16:55:35 UTC by antonmos

  • Silent install on Windows

    Hi All, First I just wanted to say I love tkdiff, I use it all the time and I love it (especailly its transparent support of Subverion and the ability to use the exact same tool on win and linux). My Question: How can I perform a silent install on Windows? I need to batch install on many hosts. What kind of installer are you guys using? NSIS? what are the flags to invoke a silent...

    2009-04-01 14:24:15 UTC by galaviel2

  • Comment: expected integer but got "bold"

    Tkdiff 4.1.3 solves the problem here. But you may have to change the properties in ~/.tkdiffrc as 4.1.4 showed font-problems when running with 8.5.4.0. The problems were not when running 4.1.4 with an older Tcl version (8.4.7). It helped to delete all -font specs out of ~/.tkdiffrc. Tests were on RHEL 4U6.

    2009-01-29 15:30:36 UTC by nobody

  • Comment: expected integer but got "bold"

    It seems that this problem comes with Tcl 8.5.4.0. With 8.4.13 same Tkdiff 4.1.3 works fine.

    2009-01-28 12:20:01 UTC by nobody

  • tkdiff-4.1.4-unix Install on Sol 8 ?

    Hello, I am trying to install this on a Sol.8 machine. I have unzipped and untarred it to a local dir on the box. I have 3 files (COPYING, Changelog, and tkdiff) in that dir. Does anyone know if I need to run the ./install command or if there is a step I am missing to get this to work? I have been unable to find a README or install file for this. thank you for any suggestions!!

    2008-12-09 22:27:29 UTC by karlhutch

  • Comment: Mercurial Support for tkdiff

    This is unfortunately a very buggy patch, because each Mercurial-repository only has a single .hg directory in the topmost dir. The patch that was submitted earlier does take this into account and also updates the usage-messages (2008-01-09, ID 1867700) That is the one that should be used IMHO Jakob.

    2008-11-25 12:15:25 UTC by nobody

  • Mercurial Support for tkdiff

    Dear developers, this is a patch to make tkdiff work with mercurial (hg). It works in nearly the same way as the cvs support. Cheers, Ottxor.

    2008-10-03 16:04:52 UTC by ottxor

  • Comment: ^M bug with tkdiff

    I've located the source of the problem, at least for Linux (and presumably other Unix machines). If the ^M precedes a number, the internal workings of tkdiff assume that it is derived from the `diff` output. I have a fix to the code, in "proc run-command": Instead of: set failed [catch "$cmd \"2>$errfile\"" stdout] do the following: regsub "^exec " $cmd "" cmd_noexec set.

    2008-09-26 21:07:53 UTC by nobody

  • Comment: expected integer but got "bold"

    I am getting this same error with tkdiff for Windows: tkdiff: Whatever version ships with TkCVS 7.2.5 tcl/tk: ActiveTcl 8.5.4.0 I found a few bug reports, this one is the most informative: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473050 Scroll down to message #40 and there is a patch to fix the error: --- BEGIN QUOTE --- Philippe Poilbarbe wrote: It seems that the...

    2008-09-12 04:02:40 UTC by nobody

Our Numbers