Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "Orion/Documentation/User Guide/Reference/Compare page"
m |
|||
| (4 intermediate revisions by 3 users not shown) | |||
| Line 1: | Line 1: | ||
= Compare page = | = Compare page = | ||
| − | The <b>Compare</b> page shows a comparison between two states of a single file. You can browse through individual differences using the <b>Next Diff</b> and <b>Previous Diff</b> buttons at the top right hand side of the page. If the file on the left is | + | The <b>Compare</b> page shows a comparison between two states of a single file or just two files. The right hand side is always read only while the left hand side can be write-able depending on how the compare page is brought up. You can browse through individual differences using the <b>Next Diff</b> and <b>Previous Diff</b> buttons at the top right hand side of the page. If the file on the left is write-able, you can merge changes from the right hand side using the <b>Copy Current Change From Right to Left</b> button, or edit the file directly. Once you have finished editing, hit Ctrl+S or click <b>Save</b> in the tool bar to save your changes. |
| − | [[Image:Orion-compare- | + | [[Image:Orion-compare-page_new.png|Compare Page]] |
| + | |||
| + | |||
| + | == Navigating differences == | ||
| + | There are two levels of differences: block and word. | ||
| + | |||
| + | === Navigating diff blocks === | ||
| + | The <b>block</b> level shows the difference between two paragraphs. Use the <b>Next Diff</b> and <b>Previous Diff</b> buttons to navigate among blocks. Or use <b>CTRL + UP/DOWN</b> arrow keys to do the same thing. | ||
| + | |||
| + | [[Image:Orion-compare-page_diff_block.png|Compare Page]] | ||
| + | |||
| + | === Navigating diff words === | ||
| + | The <b>word</b> level shows the different words within a block. There is no buttons in the tool bar but you can use <b>CTRL + SHIFT + UP/DOWN</b> arrow keys to see next/previous different words. | ||
| + | |||
| + | [[Image:Orion-compare-page_diff_word.png|Compare Page]] | ||
| + | |||
| + | == Merging from right to left side == | ||
| + | If the left hand side is write-able, you can use the <b>Copy Current Change From Right to Left</b> button to merge the current diff block. The merging does not save the left hand side until you save it manually. | ||
| + | |||
| + | == Generating compare link == | ||
| + | If you are navigating to a certain difference block&word and want to share the position of the difference, you can generate the compare URL with the current position. Note that the URL contains not only the file URL but also the block and word parameters. | ||
| + | |||
| + | [[Image:Orion-compare-page_diff_link.png|Compare Page]] | ||
| + | |||
| + | == Key bindings == | ||
| + | In addition to some common editor key bindings for the left hand side, there are several specific key bindings for the diff navigation. You can find them by clicking on you user <b>options</b> then click on <b>keyboard shortcuts</b> or use <b>SHIFT+?</b> keys. But note that <b>Ctrl+DOWN</b> and <b>Ctrl+UP</b> are already consumed by the editor if the current focus is in one of the editors. You have to click on somewhere outside of the editors in order to use those two key bindings for diff navigation. | ||
| + | |||
| + | [[Image:Orion-compare-key_bindings.png|Compare Page]] | ||
| + | |||
| + | == Related Tasks == | ||
| + | |||
| + | * [[Orion/Documentation/User Guide/Tasks/Comparing|Comparing]] | ||
| + | * [[Orion/Documentation/User_Guide/Tasks/Navigating_and_searching|Navigating and searching]] | ||
| + | |||
| + | [[Category:Orion]] | ||
Latest revision as of 11:45, 5 July 2017
Contents
Compare page
The Compare page shows a comparison between two states of a single file or just two files. The right hand side is always read only while the left hand side can be write-able depending on how the compare page is brought up. You can browse through individual differences using the Next Diff and Previous Diff buttons at the top right hand side of the page. If the file on the left is write-able, you can merge changes from the right hand side using the Copy Current Change From Right to Left button, or edit the file directly. Once you have finished editing, hit Ctrl+S or click Save in the tool bar to save your changes.
There are two levels of differences: block and word.
The block level shows the difference between two paragraphs. Use the Next Diff and Previous Diff buttons to navigate among blocks. Or use CTRL + UP/DOWN arrow keys to do the same thing.
The word level shows the different words within a block. There is no buttons in the tool bar but you can use CTRL + SHIFT + UP/DOWN arrow keys to see next/previous different words.
Merging from right to left side
If the left hand side is write-able, you can use the Copy Current Change From Right to Left button to merge the current diff block. The merging does not save the left hand side until you save it manually.
Generating compare link
If you are navigating to a certain difference block&word and want to share the position of the difference, you can generate the compare URL with the current position. Note that the URL contains not only the file URL but also the block and word parameters.
Key bindings
In addition to some common editor key bindings for the left hand side, there are several specific key bindings for the diff navigation. You can find them by clicking on you user options then click on keyboard shortcuts or use SHIFT+? keys. But note that Ctrl+DOWN and Ctrl+UP are already consumed by the editor if the current focus is in one of the editors. You have to click on somewhere outside of the editors in order to use those two key bindings for diff navigation.
