Visual merge utility

• US 20140250360A1
• Filed: 05/28/2004
• Published: 09/04/2014
• Est. Priority Date: 05/28/2004
• Status: Abandoned Application

• Current Assignee: Adobe Systems Incorporated (Adobe Inc.)
• Original Assignee: Macromedia, Inc. (Adobe Inc.)
• Inventors: Jiang, Yizhen, Wang, Weihua, Wineman, Mark
• Application Number:
  US10/856,334
• Publication Number:
  US 20140250360A1
• Time in Patent Office: Days
• US Class Current: 715/229
• CPC Class Codes: G06F 40/163 Handling of whitespace
• CPC Class Codes: G06F 40/197 Version control for software G06F8/71

Abstract

A system and method include receiving multiple modified versions of a parent document, wherein the parent document and each of the modified versions contain code to display or define underlying information therein. The system and method also include comparing each of the multiple modified versions to the parent document to determine changes made to resulting information of the parent document by modified versions, and displaying to a user the changes made to the resulting information in an end-user type display.

Claims

1. A processor implemented method comprising:

receiving a parent document that comprises source code that when interpreted by an interpreter renders an output presentation;

comparing an object model of a first modified version of the parent document to an object model of the parent document to identify changes made by the first modified version to the output presentation rendered by the interpreter, wherein the parent document and first modified version comprise underlying information and code with tags that describe at least one quality for displaying the underlying information in the output presentation, wherein the changes identified correspond to differences between the output presentation as interpreted from the parent document and the output presentation as interpreted from the first modified version of the parent document; and

displaying the output presentation in an end-user fashion, wherein the output presentation is displayed with markings showing the differences between the output presentation as interpreted from the parent document and the output presentation as interpreted from the first modified version of the parent document.

2. The method of claim 1 wherein displaying comprises visually presenting the underlying information and the at least one quality.

3. The method of claim 1 further comprising:

comparing an object model of a second modified version of a parent document to the object model of the parent document to identify changes made by the second modified version to the output presentation rendered by the interpreter, wherein the second modified version comprises underlying information and code with tags that describe at least one quality for displaying the underlying information in the output presentation, wherein the changes made by the second modified version correspond to differences between the output presentation as interpreted from the parent document and the output presentation as interpreted from the second modified version of the parent document;

displaying the output presentation by the second modified version in an end-user fashion, wherein the output presentation by the second modified version is displayed with markings showing the differences between the output presentation as interpreted from the parent document and the output presentation as interpreted from the second modified version of the parent document.

4. The method of claim 1 further comprising merging one or more of the changes into an updated document based on user instruction.

5. The method of claim 4 wherein merging comprises:

presenting options to select one or more of the changes for merging into the updated document; and

incorporating into source code of the updated document the one or more of the changes selected.

6. The method of claim 4 wherein changes made to the output presentation by the first and second modified versions are displayed with the updated document on one screen.

36. The method of claim 1 wherein said object models comprise models of the underlying information represented in their respective version, wherein the underlying information is broken up into objects which are then arranged in a hierarchical structure.

7. (canceled)

8. A processor implemented method comprising:

receiving a first and a second modified version of a parent document, wherein the parent document comprises underlying information and code with tags that define at least one quality for displaying the underlying information when said code of said parent document is interpreted by an interpreter to render an output presentation;

comparing each of the first and second modified versions to the parent document to determine changes made to a rendered output presentation of the parent document by the first and second modified versions; and

displaying the rendered output presentation with the at least one quality by said interpreter rendering said code to create an end-user type display, wherein the rendered output presentation is displayed;

with markings showing first differences between the output presentation as interpreted from the parent document and the output presentation as interpreted from the first modified version of the parent document; and

with markings showing second differences between the output presentation as interpreted from the parent document and the output presentation as interpreted from the second modified version of the parent document.

10. The method of claim 8 further comprising merging one or more of the changes into an updated document as instructed.

11. The method of claim 10 wherein merging comprises:

presenting options to select one or more of the changes for merging into the updated document; and

incorporating into source code of the updated document the one or more of the changes selected.

12. The method of claim 10 further comprising saving the updated document in a format according to a format of the parent document.

13. The method of claim 8 wherein displaying comprises visually presenting the information and the at least one quality in the marked documents by rendered code.

14. The method of claim 8 wherein comparing comprises determining that a change made to an order of child nodes on a parent node is not a change made to the rendered output presentation of the parent document.

15. The method of claim 8 further comprising:

receiving a third modified version of the parent document;

comparing the third modified version to the parent document to determine changes made to the rendered output presentation of the parent document by the third modified version; and

wherein the rendered output presentation is displayed with markings showing third differences between the output presentation as interpreted from the parent document and the output presentation as interpreted from the third modified version of the parent document.

16. The method of claim 8 wherein displaying comprises executing the code in a display for showing the first differences and the second differences and the at least one quality.

17. The method of claim 8 wherein the at least one quality of the underlying information is a meaning, a purpose, or a visual appearance.

18. The method of claim 8 wherein the comparing rendered output presentation in each modified version to rendered output presentation in the parent document comprises comparing an object model implementation of each of the first and second modified versions to an object model implementation of the parent document.

19. The method of claim 18 wherein the object model implementations are DOM implementations.

9. (canceled)

20-35. -35. (canceled)

37. (canceled)

38. A processor implemented method comprising:

receiving a parent source code document that comprises source code that when interpreted by an interpreter renders a first output presentation, wherein the parent source code document comprises underlying information and code with tags that describe at least one quality for displaying the underlying information in the first output presentation;

receiving at least a first modified version of the parent source code document, said at least a first modified version of the parent source code document comprising source code that when interpreted by the interpreter renders a second output presentation; and

presenting a user interface that comprises markings showing differences between the first output presentation and the second output presentation.

39. The method of claim 38 wherein the presenting comprises:

presenting said second output presentation with at least one marking showing and differentiating displayed items included in only one of the second output presentation and the first output presentation.

40. The method of claim 39 wherein said presenting further comprises:

presenting a first marking differentiating a first displayed item included in the first output presentation but not the second output presentation, the first marking providing a visual indication that the displayed item is included in the first presentation but not the second presentation.

41. The method of claim 39 wherein said presenting further comprises:

presenting a first marking differentiating a first displayed item included in the first output presentation but not the second output presentation, the first marking providing a visual indication that the displayed item is included in the first presentation but not the second presentation; and

presenting a second marking differentiating a second displayed item included in the second output presentation but not the first output presentation, the second marking providing a visual indication that the displayed item is included in the second presentation but not the first presentation.

42. The method of claim 41 wherein said first marking comprises at least one of a strike-through effect, a color-effect, a bolding effect, and a highlighting-effect applied to said content that is present in the first output presentation that is not present in the second output presentation.

43. The method of claim 38 wherein said parent source code document comprises a source code document for a web page;

said at least a first modified version of the parent source code document comprises a modified source code document for the web page; and

wherein said interpreter comprises a browser.

44. The method of claim 38 further comprising:

enabling a user to interaction with the user interface to select ones of the differences between the first output presentation and the second output presentation to be included in an updated version of the parent source code document.

45. The method of claim 44 further comprising:

presenting the updated version of the parent source code document in a portion of the user interface.

46. The method of claim 38 wherein said receiving the parent source code document, receiving the at least a first modified version of the parent source code document, and presenting the user interface are performed by a software application stored to a computer-readable storage medium and executing on a processor based computer.

47. The method of claim 38 further comprising:

comparing an object model of the at least a first modified version of the parent source code document to an object model of the parent source code document to identify said differences between the first output presentation and the second output presentation.

48. The method of claim 47 wherein presenting the user interface that comprises markings showing differences between the first output presentation and the second output presentation comprises including attribute information about an object to make the object stand out in the output presentation.

49. The method of claim 48 wherein the attribute information about the object comprises a tag that instructs a viewing application to present a visual identification in the output presentation.

50. The method of claim 48 wherein presenting the user interface that comprises markings showing differences between the first output presentation and the second output presentation comprises transforming a representation comprising a marked change into HTML operable to define the display of the marked change for display in the output presentation.

51. The method of claim 38 wherein the source code of the first modified version comprises user-edited source code.