descriptionmx3r is a program which merges different versions of the same file in a single one, it is particularily useful when the standard merging process fails
ownerdeavidsedice@gmail.com
last changeMon, 21 Apr 2008 20:04:58 +0000 (21 22:04 +0200)
content tags
add:
readme

mx3r unifies files that have been developed by different programmers who have worked independently, each using their own code. So, for instance, let's say you want all the features added by developer A, and all the features added by developer B in a single file.

A standard merging, or diff-patch process, might result in a series of rejects that you'll have to sort out manually, thus wasting a week or two solving problems

In the future, when mx3r becomes fully fit for use, it will be able to solve conflicts between files. It will receive the BASE, REMOTE and LOCAL files from a SCM like GIT or SVN, for example, and then, it will try to determine what happened from file A to B, and from A to C, to, finally, replay the A->B changes into C, and the A->C changes into B. The process ends when B and C are almost the same file.

shortlog
2008-04-21 David Martínez... Added -v flag. Some changes trying to merge a XML file.master
2008-04-21 David Martínez... Debug output disabled by default.
2008-04-20 David Martínez... Merge Bug corrected.
2008-04-20 David Martínez... Version 0.2.0 - Now capable of some merges. Added examp...
2008-04-20 David Martínez... Added -Wall when compiling. Deleted unused variables.
2008-04-20 David Martínez... Added -o output_file flag. Function calcBytes created.
2008-04-19 David Martínez... Added two-pass pattern search. Now the changes are...
2008-04-19 David Marnez... Some changes in plugins (bugs, improved block detection)
2008-04-17 David Martínez... Added plugin for hashing.
2008-04-17 David Martínez... Split Plugin finished
2008-04-16 David Martínez... Added -Wall to CFLAGS
2008-04-16 David Martínez... Done some work on split plugin. MMap works.
2008-04-15 David Martínez... Version 0.1.1 - Added very simple support for plugins.
2008-04-15 David Martínez... Better Makefile
2008-04-15 David Martínez... Some lines of statistic code fixed
2008-04-14 David Martínez... Moved some functionality to util.c
...
heads
16 years ago master