#filemerge

[m-coding]

Xcodeの便利な機能！ファイルマージ(FileMerge)

今回は私がXcodeを使ってプログラミングの勉強をしている時にいつもお世話になっている便利な機能をご紹介したいと思います！ みなさんもサンプルコードを見ながら勉強している場合は絶対便利なのでぜひ使ってみてくださいね！

XcodeにはFileMergeという、プログラミングファイルを比べられる機能があります。

XcodeのメニューからDeveloper Toolを選び、FileMergeを選びます。

そうするとこのような画面が出てくるので、比べたいファイルの参照場所を入力します。

こんな感じです。

Compareを押して少し待つと…

この画面が出てきたらファイル名を選びましょう。

すると！

ファイルがこのように比較されます！！

違いがある場所は上の写真のように青いハイライトで教えてくれるんです！！

これでパソコン画面とにらめっこしなくてもミスを見つけてくれますよ＾＾

プログラミングを勉強してる皆さん、ぜひ活用してみてください！

[levysoft]

FileMerge is located inside the Xcode application bundle in Xcode 4.3 and later. You can open FileMerge from Xcode by choosing Xcode > Open Developer Tool > FileMerge [...] Otherwise from Terminal you have: diff and opendiff

https://discussions.apple.com/message/19672418

[wuhrr]

Configure GUI FileMerge with the svn diff Command

<h2>The Problem</h2>

  <p>By default, the subversion <em>svn diff</em> command shows the differences in text mode. On my mac, I would like to the <em>FileMerge</em> application, which comes with Xcode instead.</p>

  <h2>The Solution</h2>

  I created a…

View Post

[wuhrr]

Configure GUI FileMerge with the svn diff Command

The Problem

By default, the subversion svn diff command shows the differences in text mode. On my mac, I would like to the FileMerge application, which comes with Xcode instead.

The Solution

I created a wrapper to opendiff, which is in turn the wrapper for FileMerge. I call this wrapper svndiff. The README.md will show how to install and use the tool.

[elsmorian]

Dude, where's my 10.7 Lion FileMerge.app!?

Recently I wanted to merge two files, and had been using git on OSX 10.6 Snowleopard to do all my merging commits etc. 

I tried to fire up the FileMerge.app that is included with the Developer Tools in 10.6, only to find it's nowhere to be found in 10.7 Lion. Some rummaging found it, hiding inside Xcode 4, that I downloaded from the app store.

It can be found in /Applications/Xcode.app/Contents/Applications along with Application Loader.app, Icon Composer.app, Instruments.app and OpenGL ES Performance Detective.app if you're looking for those too!

(Note I'm running Xcode 4.3.2 (4E2002) from the App Store on Lion 10.7.3 , YMMV.

[trialbybyte]

Lion and FileMerge

Ran into another issue because of my recent upgrade to Lion. I use Coda for dev work and have grown used to the built-in source control. One of the features in Coda is a compare files function which uses the FileMerge.app to display the differences.

Knowing that FileMerge is part of the developer tools I proceeded to download the Xcode application from the Mac App Store. To my dismay FileMerge still did not want to compare the files.

After some digging I found Coda uses the `opendiff` command to launch FileMerge. Running the command manually brings up the following error message:

xcode-select: Error: No Xcode folder is set. Run xcode-select -switch <xcode_folder_path> to set the path to the Xcode folder.

So it seems like `opendiff` doesn't know where your Xcode.app is by default. To fix it, run the following command:

sudo xcode-select -switch /Applications/Xcode.app

The compare files feature in Coda now works as expected.

[kmm]

とはいえ、その作業は実にカンタン。Preferencesを表示し、Filtersタブに「/usr/bin/iconv -c -f UTF-8 -t SJIS $(FILE)」という行を追加するだけでOKだ。これだけで、拡張子が「.txt」のUTF-8ファイルも支障なく差分をとることができる。ほかのファイルに適用したい場合は、その拡張子用の行を追加すればいい。 　なお、バックスラッシュの処理に関連して、iconvコマンドに「-c」オプション（エラー発生時に無視する）を付加しているが、注意すべき点はそれだけ。EUC-JPやISO-2022-JPにも応用できるため、試してみてほしい。