#38 Support another diff tool

closed
nobody
None
5
2007-05-12
2007-02-22
Anonymous
No

The feature of directly editing of compring files is supported by many graphical diff tools (WinMegre, gvimdiff, ...). But tkdiff doesn't. Is it possible to implement support of another diff tool in tkcvs?

Directly editing of compring files is very useful to copy some differences from one file to another one. It's allow immediately view the result of mergeing.

Thanks for a tkcvs tool!

Sorry for not very well English.

Andrew.

Discussion

  • DorothyR

    DorothyR - 2007-02-23

    Logged In: YES
    user_id=18012
    Originator: NO

    This is possible already. You can change cvscfg(tkdiff), but you usually have to write a wrapper for your diff tool to get it to check out the versions, and because its command-line options are probably different from tkdiff's. The attached example is a gvim-wrapper called "cvsdiff." People are using it here and setting cvscfg(tkdiff) to "cvsdiff."

    File Added: cvsdiff

     
  • DorothyR

    DorothyR - 2007-02-23

    wrapper for gvim diff for use as tkcvs_config(tkdiff)

     
  • Nobody/Anonymous

    Logged In: NO

    Thank you for quick reply!

    It works, so everything is fine! :-)

    Btw, I found such question in Open Discussion forum at 2003-05-28. In that version of diff wrapper the bash shell is used, but in version you're attached above, the ksh shell is used. Why?

    Are you're going to include this example of another diff tool usage into official TkCVS distribution?

     
  • DorothyR

    DorothyR - 2007-02-24

    Logged In: YES
    user_id=18012
    Originator: NO

    I don't know why ksh vs sh. This version is exactly what the guys at work use. Either they changed it, or I was more conscientious last time and edited their comments out, discovering in the meantime that no ksh syntax was actually used. You're right, I should clean it up and provide it with the distribution.

    dorothy

     
  • DorothyR

    DorothyR - 2007-04-27
    • status: open --> pending
     
  • DorothyR

    DorothyR - 2007-04-27

    Logged In: YES
    user_id=18012
    Originator: NO

    I put the wrapper cvsdiff in a new contrib directory.

     
  • SourceForge Robot

    Logged In: YES
    user_id=1312539
    Originator: NO

    This Tracker item was closed automatically by the system. It was
    previously set to a Pending status, and the original submitter
    did not respond within 14 days (the time period specified by
    the administrator of this Tracker).

     
  • SourceForge Robot

    • status: pending --> closed
     

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks