Difference Engine, Java

Posted on 2007-08-08
Last Modified: 2013-12-29
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,

Question by:vRisc
    LVL 10

    Expert Comment

    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.
    LVL 10

    Accepted Solution


    Author Comment

    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,

    LVL 17

    Assisted Solution

    by:Dejan Pažin
    Take a look at Guiffy:
    LVL 1

    Expert Comment

    Forced accept.

    EE Admin

    Write Comment

    Please enter a first name

    Please enter a last name

    We will never share this with anyone.

    Featured Post

    Top 6 Sources for Identifying Threat Actor TTPs

    Understanding your enemy is essential. These six sources will help you identify the most popular threat actor tactics, techniques, and procedures (TTPs).

    Suggested Solutions

    For customizing the look of your lightweight component and making it look lucid like it was made of glass. Or: how to make your component more Apple-ish ;) This tip assumes your component to be of rectangular shape and completely opaque. (COD…
    Introduction Java can be integrated with native programs using an interface called JNI(Java Native Interface). Native programs are programs which can directly run on the processor. JNI is simply a naming and calling convention so that the JVM (Java…
    Video by: Michael
    Viewers learn about how to reduce the potential repetitiveness of coding in main by developing methods to perform specific tasks for their program. Additionally, objects are introduced for the purpose of learning how to call methods in Java. Define …
    Viewers learn how to read error messages and identify possible mistakes that could cause hours of frustration. Coding is as much about debugging your code as it is about writing it. Define Error Message: Line Numbers: Type of Error: Break Down…

    759 members asked questions and received personalized solutions in the past 7 days.

    Join the community of 500,000 technology professionals and ask your questions.

    Join & Ask a Question

    Need Help in Real-Time?

    Connect with top rated Experts

    13 Experts available now in Live!

    Get 1:1 Help Now