Shachar Tal wrote:
Hi all,
I am working with an organization whose R&D uses a crappy toolset for visual comparisons and merges for file versions. We feel the need to find a better one.
The requirements are:
* syntax parsing of C++/Java (e.g. tokenization is smarter than the avergate "you type 'e' here and deleted the 'v' there", but rather "member x was replaced by member y".)
* colorful highlighting of changes.
* runnable on Windows.
* connectible to other tools via command line parameters etc.
* Three-way view of merge (i.e. given most recent common ancestor of two to-be-merged vesions, will find diff of each from said ancestor, and merge those, which is more intelligent than doing it without looking at the history of the file).
* Open-sourceness is not a requirement.
One tool that I found is called Araxis Merge, and while doing most of the above, I doesn't understand syntax. As far as I could tell, the first requirement is the hardest to find in a tool.
Does anyone have any experience/recommendations?
Thanks,
--
________________________________________ Haim Cohen Software Engineer [EMAIL PROTECTED] Analog Devices Israel (972) - 9 - 9715 406
-------------------------------------------------------------------------- Haifa Linux Club Mailing List (http://www.haifux.org) To unsub send an empty message to [EMAIL PROTECTED]
