Unlock instant, AI-driven research and patent intelligence for your innovation.

Method and device for integrating multiple different versions of electronic files

A technology of electronic documents and versions, applied in version control, program control devices, electronic digital data processing, etc., can solve problems such as time delays for potential problems

Inactive Publication Date: 2006-06-07
IBM CN
View PDF0 Cites 8 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

But during development, compilation happens at a later time than merging, delaying the developer's awareness of any potential problems
Late testing incurs additional cost and time in the development process

Method used

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
View more

Image

Smart Image Click on the blue labels to locate them in the text.
Viewing Examples
Smart Image
  • Method and device for integrating multiple different versions of electronic files
  • Method and device for integrating multiple different versions of electronic files
  • Method and device for integrating multiple different versions of electronic files

Examples

Experimental program
Comparison scheme
Effect test

Embodiment Construction

[0018] The present invention provides a solution for merging electronic documents. In one embodiment of the invention, conflicting deltas may be identified and notifications provided, thereby alerting developers of conflicts. Such a notification allows the developer to perform any needed edits to the merged electronic document before proceeding to the next stage of the development process. In another embodiment, relationships between increments may be identified, such as whether an increment depends on, or is a prerequisite for, another increment. A set of rules can be applied to determine which delta will be accepted or rejected from the merged document.

[0019] FIG. 1 is a schematic diagram showing a system for merging electronic documents according to an embodiment of the present invention. The term documentation as used herein refers to a software module or other structured electronic file. The files may specify text, including, but not limited to, source code, compute...

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
Login to View More

PUM

No PUM Login to View More

Abstract

A method of merging multiple different versions of an electronic document during a software development process may include identifying the multiple different versions of the electronic document. The electronic document may have a defined structure. The method may also include determining a plurality of deltas between the different versions and determining a relationship between individual deltas of the plurality of deltas based on the defined structure of the electronic document. Based on the determined relationship, one or more of the plurality of increments may be selectively accepted in the merged electronic document.

Description

technical field [0001] The present invention relates to software development, and more particularly, to software development tools. Background technique [0002] Modern software is complex in nature and is often formed from a collection of many different documents. Because the size and complexity of the documents themselves can be significant, it is common practice to assign the responsibility for developing and maintaining each document to a group of developers. When two developers make changes to the same document, it is necessary to combine each individual and / or team contribution into a single document that will be incorporated into the software build. [0003] A software-based tool, known as a merge tool, is able to combine the contributions of different individuals or teams into a merged document. Typically, merge tools automatically compare whether two or more documents are different documents to be combined or different versions of the same document. The documenta...

Claims

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
Login to View More

Application Information

Patent Timeline
no application Login to View More
Patent Type & Authority Applications(China)
IPC IPC(8): G06F17/30G06F9/44
CPCG06F8/71G06F40/194G06F40/197
Inventor S·科旺M·穆斯塔法F·普兰特
Owner IBM CN