Anybody know of a better open source diff than diff? Possibly in one of
the open source SCM systems like darcs, mercurial, or arch/tla?
The specific problem I have is that I have two Java source code files.
These are the source files. One is for send; one is for receive. That
way I can test them independently.
However, in the end product, the communication is bidirectional. So, I
need to merge them together. That's cool.
I've done the initial merging by hand (what a pain). That needed to be
done. I back propagated the changes from the merged source back to the
individual files. At this point, the merged source file pretty much
looks like an almost unchanged merge of the two original files.
Diff, however, begs to disagree. It *loves* to match on single braces
rather than finding the extremely large chunk of matching text further on.
I would *really* like a differ that tries a little harder to find
context. That way, when I make changes to the original files and then
diff them against the merged file, it should pretty much propagate the
changes forward withotu a lot of hand editing.
Any ideas?
Thanks,
-a
--
[email protected]
http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
