Structured object model merge tool with static integrity constraint observance
First Claim
1. An article comprising a machine-readable medium tangibly embodying instructions that when performed by one or more machines result in operations comprising:
- identifying at least two transactional units during a merging of at least two versions of a file, the transactional units including members requiring uniform handling to avoid violation of one or more static integrity constraints;
receiving user-generated input selecting one of the transactional units in a first version of the file; and
copying the members of the selected transactional unit to a second version of the file.
1 Assignment
0 Petitions
Accused Products
Abstract
An object-based merge tool for structured object models encapsulates data in files, such as metadata in XML files, as model objects in accordance with an underlying model, all of which can be graphically represented to a user. Graphical representation of files also allows the user to see how the files have been changed and allow for the observation of static integrity constraints. The differences between files or file sets can be graphically represented to the user, such as through markings of the model objects in the tree structure, and the differences can be explained in an additional view. Related apparatus, computer program products and computer systems are also described.
21 Citations
20 Claims
-
1. An article comprising a machine-readable medium tangibly embodying instructions that when performed by one or more machines result in operations comprising:
-
identifying at least two transactional units during a merging of at least two versions of a file, the transactional units including members requiring uniform handling to avoid violation of one or more static integrity constraints; receiving user-generated input selecting one of the transactional units in a first version of the file; and copying the members of the selected transactional unit to a second version of the file. - View Dependent Claims (2, 3, 4, 5, 6, 7)
-
-
8. A computer-implemented method comprising:
-
identifying at least two transactional units during a merging of at least two versions of a file, the transactional units including members requiring uniform handling to avoid violation of one or more static integrity constraints; receiving user-generated input selecting one of the transactional units in a first version of the file; and copying the members of the selected transactional unit to a second version of the file. - View Dependent Claims (9, 10, 11, 12, 13, 14)
-
-
15. An apparatus comprising:
-
means for identifying at least two transactional units during a merging of at least two versions of a file, the transactional units including members requiring uniform handling to avoid violation of one or more static integrity constraints; means for receiving user-generated input selecting one of the transactional units in a first version of the file; and means for copying the members of the selected transactional unit to a second version of the file. - View Dependent Claims (16, 17, 18, 19, 20)
-
Specification