R – ny way to save a patch/diff file in Araxis Merge

araxisdiffpatch

I'm merging some code and would like to save one diff to compare against another diff. (I'm in the dreaded diff-the-diff's scenario). Anyhow, the normal way I would do this would be to save to patch files and compare them to make sure the correct changes were applied.

Is there any way to get Araxis to generate a patch file for a diff I'm currently viewing?

Best Solution

Those little pranksters at Araxis removed the File menu. Took me a few minutes to figure out that the Report button was now hidden in plain sight, in the middle of the top panel.

For the next wondering soul, a little hint:

The not-so-hidden report button placement

This gets you to the Reports dialog with its nice UNIX Diff option.

Related Solutions

Git – Creating a patch file from a diff of 2 folders

If you have two directories a and b that are similar, and you want b to be the same as a, you can create and apply a patch with:

$ diff -ur b a > ba.diff
$ patch -i ba.diff

Suppose you have directories local (containing your local version of upstream1.0), upstream1.0, and upstream1.1. To create and apply your changes to upstream1.1:

$ diff -ur upstream1.0 local > my.diff
$ cd upstream1.1
$ patch -i ../my.diff

Check the documentation for patch, and try to convince the upstream maintainers to use git. Things will be much simpler if you can use git tools to work with your local repository.

Git – How to apply `git diff` patch without Git installed

git diff > patchfile

and

patch -p1 < patchfile

work but as many people noticed in comments and other answers patch does not understand adds, deletes and renames. There is no option but git apply patchfile if you need handle file adds, deletes and renames.

EDIT December 2015

Latest versions of patch command (2.7, released in September 2012) support most features of the "diff --git" format, including renames and copies, permission changes, and symlink diffs (but not yet binary diffs) (release announcement).

So provided one uses current/latest version of patch there is no need to use git to be able to apply its diff as a patch.

Best Solution

Related Solutions

Git – Creating a patch file from a diff of 2 folders

Git – How to apply `git diff` patch without Git installed

Related Question