# Try making a Filefilter
WinMerge handles this just fine.  You want to create and use a [**Filter**](http://manual.winmerge.org/Filters.html).  Under `Tools | Filters... | Filefilters`, create a new filter or modify an existing one.

It will look like this:

    ## Ignore Java class and jar files
    f: \.class$
    f: \.jar$
    
    ## Ignore subversion housekeeping directories
    d: \\.svn$
    d: \\._svn$

Save it, then when selecting items to merge, select the filter you defined from the `Select Files or Folders` dialog box. Bonus points: It will save this and use it as a default for future merges.

# Try Builtin File Filter

WinMerge (Version 2.12.4) already includes a [filter](http://manual.winmerge.org/Filters.html) to exclude source control files and directories, and it&#39;s called **Exclude Source Control**.

It works for Subversion, CVS, Git, Bazaar and Mercurial, and it doesn&#39;t require you to create a filter, you just have to apply it during the comparison.

# Uncomment some lines in builtin filefilter
WinMerge (Version 2.12.4) already includes a filter but (at least in my installation) the filters for Subversion, Git and Bazaar were commented out.

Navigate here: `Tools | Filters | Filefilters | Exclude Source Control` (double click to edit)

Edit the lines to look like this:

    d: \\.svn$ ## Subversion working copy
    d: \\_svn$  ## Subversion working copy ASP.NET Hack
    d: \\cvs$   ## CVS control directory
    d: \\.git$ ## Git directory
    d: \\.bzr$ ## Bazaar branch
    d: \\.hg$ ## Mercurial repository

In PHP, I can do this:

    echo &#39;&lt;pre&gt;&#39;
    print_r($array);
    echo &#39;&lt;/pre&gt;&#39;

In Python, I currently just do this:

    print the_list

However, this will cause a big jumbo of data. Is there any way to print it nicely into a readable tree? (with indents)?

How to print a list in Python &quot;nicely&quot;

This is one of those things that I&#39;m sure there&#39;s a built-in function for (and I may well have been told it in the past), but I&#39;m scratching my head to remember it.

How do  I loop through each row of a multi-column range using Excel VBA?  All the tutorials I&#39;ve been searching up seem only to mention working through a one-dimensional range...

Loop through each row of a range in Excel

I&#39;m trying to recursively compare two Subversion working copy folders using WinMerge.

Unfortunately, WinMerge displays lots of differencing files inside of the subversion control folders (`.svn` or `_svn`).

Is it possible to somehow exclude the subversion folders from the comparison? Or is there another (free) diff-tool which is able to do this?

How to ignore SVN folders in WinMerge?

I'm trying to recursively compare two Subversion working copy folders using WinMerge.
Unfortunately, WinMerge displays lots of differencing files inside of the subversion control folders (<code>.svn</code> or <code>_svn</code>).
Is it possible to somehow exclude the subversion folders from the comparison? Or is there another (free) diff-tool which is able to do this?

I want to check code from the repository http://code.sixapart.com/svn/perlbal/ . I can only access the the repository url by setting a proxy. I guess if I want to get the code from the same URL by svn I need to configure a proxy, too. So does anyone of you could tell me how to configure a HTTP proxy in svn? 

By the way, I use the command-line `svn` client under Linux.


How to configure a HTTP proxy for svn

When I grep my Subversion working copy directory, the results include a lot of files from the .svn directories. Is it possible to recursively grep a directory, but exclude all results from  .svn directories?

Exclude .svn directories from grep

Is there any way to commit only a list of specific files (e.q. just one of the list of files that SVN wants to commit).

I&#39;m working on MAC OS X under Terminal, without any UI.

SVN Commit specific files

I managed to shoot myself in the foot this morning by doing the following:

&lt;ol&gt;
&lt;li&gt;Started working on a change to my project&lt;/li&gt;
&lt;li&gt;Made a bunch of edits to a bunch of files&lt;/li&gt;
&lt;li&gt;Realized that my approach was all wrong, and that I needed to start over&lt;/li&gt;
&lt;li&gt;cd&#39;d to the top level of my project and did a &quot;svn --recursive revert .&quot; to restore my local sandbox to its pre-changes state.&lt;/li&gt;
&lt;li&gt;Howled in horror as I realized that there had been a number of other changes outstanding in my local sandbox, and I had just obliterated all of them.  (the svn server had been down last Friday so I hadn&#39;t been able to check them in, and I had forgot about them over the weekend)&lt;/li&gt;
&lt;/ol&gt;

Fortunately in this case I had done an &quot;svn diff &gt; temp.txt&quot; before leaving work on Friday, and the temp.txt file was still on my hard drive, so I was able to feed that file into &quot;patch&quot; and recover my lost changes.

But for my future reference (i.e. the next time I make the same dumb mistake)... is there any way to tell svn to undo an &quot;svn revert&quot;?  Does svn keep a backup of the local/not-checked-in diffs anywhere?


Is there a way to recover from an accidental &quot;svn revert&quot;?

I&#39;m trying to browse an SVN repository without having to check it out:

 - Is it possible to do this locally (on Unix)?
 - Is this possible with ssh access?

Browsing an SVN Repository

I need to work with large files and must find differences between two. And I don&#39;t need the different bits, but the number of differences.

To find the number of different rows I come up with 

    diff --suppress-common-lines --speed-large-files -y File1 File2 | wc -l

And it works, but is there a better way to do it?

And how to count the exact number of differences (with standard tools like bash, diff, awk, sed some old version of perl)?

How to count differences between two files on linux?

I staged a few changes to be committed; how can I see the diff of all files which are staged for the next commit? I&#39;m aware of &lt;a href=&quot;http://git-scm.com/docs/git-status&quot;&gt;git status&lt;/a&gt;, but I&#39;d like to see the actual diffs - not just the names of files which are staged.

I saw that the &lt;a href=&quot;http://git-scm.com/docs/git-diff&quot;&gt;git-diff(1)&lt;/a&gt; man page says

&gt; git diff [--options] [--] [&lt;path&gt;…]
&gt;
&gt; This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell git to further add to the index but you still haven&#39;t. You can stage these changes by using git-add(1). 

Unfortunately, I can&#39;t quite make sense of this. There must be some handy one-liner which I could create an alias for, right?

How do I show the changes which have been staged?

Have two folders with approx. 150 java property files.

In a shell script, how to compare both folders to see if there is any new property file in either of them and what are the differences between the property files.

The output should be in a report format.

Compare two folders which have many files inside contents

I&#39;d like to use &#39;diff&#39; to get a both line difference between and character difference.
For example, consider:

**File 1**&lt;br&gt;

    abcde
    abc
    abcccd

**File 2**&lt;br&gt;

    abcde
    ab
    abccc

Using **diff -u** I get:

    @@ -1,3 +1,3 @@
     abcde
    -abc
    -abcccd
    \ No newline at end of file
    +ab
    +abccc
    \ No newline at end of file

However, it only shows me that were changes in these lines. What I&#39;d like to see is something like:

    @@ -1,3 +1,3 @@
     abcde
    -ab&lt;ins&gt;c&lt;/ins&gt;
    -abccc&lt;ins&gt;d&lt;/ins&gt;
    \ No newline at end of file
    +ab
    +abccc
    \ No newline at end of file

You get my drift.

Now, I know I can use [other engines][1] to mark/check the difference on a specific line. But I&#39;d rather use one tool that does all of it.

  [1]: http://code.google.com/p/google-diff-match-patch/

Using &#39;diff&#39; (or anything else) to get character-level diff between text files

I can get diffs between two revisions using something like 

    svn diff -r 100:200 &gt; file.diff

But the problem is that there are many lines that show up due to change in whitespace. Is there a way to only write those lines that actually change in a significant way and not just in whitespace?

how to make svn diff show only non-whitespace line changes between two revisions

Is there a way to use Winmerge inside of git to do Diffs? 


use Winmerge inside of Git to file diff

I&#39;m using [Git Extensions][1] and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I&#39;m very fond of Winmerge though and would like to replace KDiff with Winmerge.

In the Git Extensions settings, there are settings to change the Mergetool, but I can&#39;t seem to figure out what syntax I should use and why. There seem to be 4 variables: $BASE, $LOCAL, $REMOTE, $MERGED. It seems that I should pass these to WinMergeU.exe, but with which command line parameters? 

I&#39;ve tried to search for this a few times, but there is no answer that actually seems to work.

  [1]: http://code.google.com/p/gitextensions/

How to use Winmerge with Git Extensions?

When you install winmerge after TortoiseSVN it gives you the option of associating winmerge with Tortoise. But if we install TortoiseSVN after winmerge how can we associate Winmerge to be used instead of Tortoise default diff viewer.

How to integrate WinMerge with TortoiseSvn after installation?

I&#39;m trying to integrate WinMerge with Git as I&#39;ve seen others done before on Windows 7 Ultimate.

I&#39;ve followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff.

Created a file called winmerge.sh in the root directory of git: C/Program Files (x86)/Git/ with: WinMergeU is the correct location.
    

    #!/bin/sh
    echo Launching WinMergeU.exe: $1 $2
    &quot;C:/Program Files (x86)/WinMerge/WinMergeU.exe&quot; 
    git /e /u /dl &quot;Base&quot; /dr &quot;Mine&quot; &quot;$1&quot; &quot;$2&quot;

and used the following commands.

    git config --global diff.tool winmerge
    git config --global difftool.winmerge.cmd &quot;winmerge.sh \&quot;$LOCAL\&quot; \&quot;$REMOTE\&quot;&quot;
    git config --global difftool.prompt false

The error shows up as:

    git config option merge.tool set to unknown tool: winmerge


Content Type	Original Author	Original Content on Stackoverflow
Question	M4N	View Question on Stackoverflow
Solution 1 - Svn	Greg	View Answer on Stackoverflow
Solution 2 - Svn	djule5	View Answer on Stackoverflow
Solution 3 - Svn	Roberto	View Answer on Stackoverflow

How to ignore SVN folders in WinMerge?

Svn Problem Overview

Svn Solutions

Solution 1 - Svn

Try making a Filefilter

Solution 2 - Svn

Try Builtin File Filter

Solution 3 - Svn

Uncomment some lines in builtin filefilter

Loop through each row of a range in Excel

How to print a list in Python "nicely"

Attributions