Difference Engine, Java

Hello experts,

I am going to read in some files that are changed versions of an original. i.e.  an original is distributed to more people, they change it and send it back, then I have to merge all their changes for version N+1, and then give them back the file for improvement, it diverges again, then I have to merge for N+2, and so on.

Does anyone know of a difference engine I could use with Java? I want to be able to pass it the original, and the branches, and it should do the magic of merging. If a conflict arises, then it should tell me what happened and not merge the files.

Any pointers would be great to have.


Thank you,


vRiscAsked:
Who is Participating?
 
mbvvsatishCommented:
install CVS and keep your file in CVS.
Use eclipse with CVS plugin and u you can do the merging using the eclipse's CVS plugin.
it merges the local version with CVS version if no conflicts and if there is a conflict it shows you with a red mark so that you can merge manually.
0
 
vRiscAuthor Commented:
Thanks for the quick reply,

Doing it with Eclipse would mean automating it. Also, due to permissions it's not easy have Eclipse run on the people's computers whom are going to merge the files. (It's not just me)

The Java application I'm writing checks the content for errors, and annotates errors to the different entries. Merging content is only one part of the whole picture.

I like the idea of using CVS, or SVN, or any other simplistic diff engine, but how do I operate the process from within my Java application?


Thank you,


0
 
Dejan PažinConnect With a Mentor Head of SW DevelopmentCommented:
Take a look at Guiffy: http://www.guiffy.com/features.html
0
 
Computer101Commented:
Forced accept.

Computer101
EE Admin
0
Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

All Courses

From novice to tech pro — start learning today.