Logicking's CodePatch

CodePatch is a free easy to use utility for updating your source code files. CodePatch can also make patches by itself. You can download CodePatch from downloads page.

CodePatch works in "Merge Code" and "Create Patch" modes.

Check out CodePatch page at Google Code.

MERGE CODE MODE

You should use this mode whenever you want to update some third-party provided code you use in your project to the newer version without losing changes you've done to this code by yourself.

CodePatch will walk recursively through the sub-folders and check every file it will find: binary or text.

CodePatch is using three-way merge (also know as merging from a common ancestor) algorithm to merge text files. This algorithm considers changes made by you (specified in 'My path') and changes released by third-party provider ('Their path') relative to the original version of the code ('Base path').

CodePatch can call external diff program to allow you manually resolve merging conflicts in text files.

For binaries CodePatch will use a modified file from the 'My path' or 'Their path' if there is only one file that has differences relative to the one from 'Base path', otherwise it will report a conflict.

After the merge is done CodePatch writes statistics of performed actions into the log file.

CREATE PATCH MODE

Create Patch mode should be used whenever you want to find out which files from your working folder specified by 'My path' have been modified relative to files in the 'Base path' folder.

In this mode CodePatch checks files and put the modified ones into the "Result path" folder.