Best IT Recipes

Comparing image files with multiple files in Mac OS 10.7

Can I view "svn diff" output graphically on Mac OS?

Most graphical comparison programs allow you to view only one file at a time. Which is very inconvenient when you use SVN and have changed like 10 files.

For Linux, I found a solution in the kompare program. I do:

svn diff > diffOut; kompare diffOut

As a result, I work with a graphics program and check all files at once, as shown in the figure .

Is it the same for Mac OS?

The PS "meld" program seems to do the same (or not?), And I already tried to install it, but got an error . Therefore, I believe that I can not install it under OSx 10.7.

+45
svn diff macos
Aug 07 2018-12-12T00:
source share
11 answers

  • There is a computer for Mac OS. It is included in the KDE SDK and can be obtained using MacPorts:

     sudo port install kdesdk4 launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist export PATH="/Applications/MacPorts/KDE4/kompare.app/Contents/MacOS:"$PATH

    and it works!

  • Svn supports the so-called external difference .

To use it, you need to create an svn-wrapper script that will accept the parameters returned by the svn diff command, and the call differs in the required parameters.

here is an example of parameters: "svn diff" returns:

 -u -L code/Class1.h (revision 16518) -L code/Class1.h (working copy) code/.svn/text-base/Class1.h.svn-base code/Class1.h

opendiff needs the last two. Therefore, the following bash script would be appropriate:

 #!/bin/sh if [ $# -lt 2 ]; then echo "usage: $0 [ignored args...] file1 file2" >&2 exit 1 fi # The last two arguments passed to this script are the paths to the files # to diff. while [ $# -gt 2 ]; do shift done exec opendiff $*

put this script in svnwrapper.sh file. Executable executable file:

 chmod +x svnwrapper.sh

and put it in some common path that is added to the $ PATH variable. Now you can invoke svn using

 svn diff --diff-cmd=svnwrapper.sh

or just add the ~ / .subversion / config file to the [helpers] section:

 diff-cmd = svnwrapper.sh
+3
Aug 14 2018-12-12T00:
source share

You can use the Apple FileMerge tool or Kaleidoscope . Both of them have command line calls:

  • to open FileMerge, install command line development tools from within Xcode and use opendiff
  • to open the kaleidoscope, install its command line tools from inside the kaleidoscope and use ksdiff
+62
Aug 07 '12 at 16:11
source share

KDiff is an open source visual text markup program. You can use it on windows, unix, linux and mac osx. Give it a try. In windows, it automatically adds itself to svn diff. I do not use Mac OSX, so I can’t say that this feature is also available there.

compares or combines two or three text input files or directories,

After the URL of the image from the site, kdiff3 shows that it compares directories.

+9
Aug 19 '12 at 20:12
source share

DiffMerge is free and great. Also has 3-way comparison and merge.

+4
Dec 17 '13 at 12:35
source share

Kaleidoscope is a really good choice if you want to quickly switch to comparing directory structures and files in directories. It is also possible to compare more than 2 copies. I also got the impression that the file comparison algorithm (matching blocks and color code changes) is really good. In the end, a 15-day trial is available for what you need to pay.

+2
Oct. 15 '13 at 18:03
source share

I'm not quite sure if I understood correctly, but I am using Eclipse with the subclipse plugin on mac.

http://www.eclipse.org/downloads/?osType=macosx

Make sure you read the page to get the correct version, and also consider the svn version for your use.

http://subclipse.tigris.org/servlets/ProjectProcess;jsessionid=1BCECCE84434FF08FDE32136D13FF061?pageID=p4wYuA

During installation, you can select the synchronization perspective, view all conflicting files, and request a change.

I am not sure, however, if this allows your word to say random files, which I think is your question. However, you can try.

0
Aug 19 '12 at 21:12
source share

This is a good tool for comparing files and files. P4Merge: http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools

0
Feb 28 '14 at 20:39
source share

Bruno De Fraine wrote several scripts that run OSX FileMerge for each file: http://www.defraine.net/~brunod/fmdiff/

Install

 > svn co http://soft.vub.ac.be/svn-gen/bdefrain/fmscripts/ fmscripts > cd fmscripts > make > sudo make install

Diff (launch FileMerge for each file)

 > svn diff --diff-cmd fmdiff
0
Jul 18 '14 at 4:34
source share

Beyond Compare is not free, but I used it and liked it.

0
Feb 04 '15 at 1:36
source share

Here you can find the latest Meld installer for OSX .dmg .

0
Mar 28 '19 at 12:26
source share

Beyond Compare is another one you can add to the list. It is free and cross-platform (Windows, Mac, Linux).

-2
Nov 21 '15 at 12:19
source share


More articles:


All Articles