International Business Machines Corporation

Hao Q La

Wesley Gyure

Anne Frances Ross

Mary Lou Dickson

Samar Choudhary

Shikha Srivastava

Jean-Marc Paulin

Embodiments of the present invention provide a method, system and computer program product for the automated merger of content in progeny of a primary file in a version control system. In one embodiment of the invention, the method can include establishing different segments of content in a primary file in a merger tool executing in memory by a processor of a host computer and associating each of the segments with a classification corresponding to a particular merger rule selected from amongst different merger rules. The method also can include parsing content in different progeny of the primary file and identifying changes in a parsed portion of the progeny corresponding to a specific one of the segments of the primary file. Finally, the method can include applying to the identified changes a merger rule corresponding to a classification associated with the specific one of the segments.

Automated file merging through content classification

An upgrade of an application product is installed to a first location in a shared environment that is different than a second location in the shared environment. An indication of the newer version of the application product and an indication of the first location are recorded in a registry that comprises indications of a plurality of application products and locations corresponding thereto. Metadata and binding information are obtained from an instance of the previous version of the application product while the instance of the previous version of the application product continues running. The metadata and the binding information are instantiated for an instance of the newer version of the application product in execution space thereof. Work is diverted work from the instance of the previous version of the application product to the instance of the newer version of the application product while both instances continue running in the shared environment.

Smart rebinding for live product install

Growing community of inventors

Raleigh, NC, United States of America

Hao Q La