Results 1 to 5 of 5

Thread: svn diff for RapidSVN?

  1. #1
    Join Date
    Jun 2009
    Location
    Norway
    Beans
    412
    Distro
    Kubuntu 16.04 Xenial Xerus

    svn diff for RapidSVN?

    Hi, is there anything like 'svn diff' in terminal for RapidSVN? The diff tool thingie in Preferences does not seem to do the same, as it want to compare two files. What I want is to compare folders to see what changes I've made, like 'svn diff' and 'svn status'. This is to prevent me to commit changes I don't want to commit.

    Thanks.
    My intent is not to flame. I am unarmed. -- QIII; thanks!

  2. #2
    Join Date
    Apr 2009
    Location
    Germany
    Beans
    2,134
    Distro
    Ubuntu Development Release

    Re: svn diff for RapidSVN?

    I don't know rapidsvn but you can use meld on the working folder to get this information nicely displayed.

  3. #3
    Join Date
    Jun 2009
    Location
    Norway
    Beans
    412
    Distro
    Kubuntu 16.04 Xenial Xerus

    Re: svn diff for RapidSVN?

    That's what I have set in Preferences for "Diff tool", but I still get an error thrown at me when trying to just diff in a folder instead of comparing files.
    Dunno what I'm doing wrong.
    My intent is not to flame. I am unarmed. -- QIII; thanks!

  4. #4
    Join Date
    Jun 2008
    Beans
    10

    Re: svn diff for RapidSVN?

    From within RapidSVN, my experience that the diff will only work on the same working copy, but different revisions. It seems from your description that you are comparing across working copyies (eg. comparing a branch to a trunk).

    If I want to do that, I just use meld outside of RapidSVN. meld does nice directory comparisons (which I think you already know, based upon your post).

  5. #5
    Join Date
    Jun 2007
    Location
    Canada
    Beans
    370

    Re: svn diff for RapidSVN?

    You can set up meld for use as a diff/merge tool with RapidSVN. Documentation for doing that is here:

    http://www.rapidsvn.org/index.php/On..._as_Merge_Tool
    GCS/O d+(-@) s: a-->? C(++) UL P+ L+++@ E@
    W++$ N++ !o K++ w(++) !O M(-) !V PS+(++)
    PE-() Y+ PGP++ t++(+++@)* 5++ X++@ R+++@
    tv+ b++(+++) DI++ D+ G+ e++>++++ h- r y?

Tags for this Thread

Bookmarks

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •