IDE Window: Diff: what changed
Revision 0 to 1. Removed lines have a minus sign; added lines have a plus sign.
Title: IDE Window: Diff
| Old | New | Line | |
|---|---|---|---|
| 1 | + | ## Contents | |
| 2 | + | ||
| 3 | + | * 1 Purpose | |
| 4 | + | * 2 Limitations | |
| 5 | + | * 3 Text1 | |
| 6 | + | * 4 Text2 | |
| 7 | + | * 5 Options | |
| 8 | + | * 6 Close | |
| 9 | + | * 7 Open Diff in Editor | |
| 10 | + | * 8 Save diff | |
| 11 | + | ||
| 12 | + | ## Purpose | |
| 13 | + | ||
| 14 | + | The diff tool lets you compare two files (or selected parts from two files). It can create a **diff** in Context format. See: | |
| 15 | + | ``` | |
| 16 | + | <http://en.wikipedia.org/wiki/Diff#Context_format>. | |
| 17 | + | ``` | |
| 18 | + | ||
| 19 | + | ## Limitations | |
| 20 | + | ||
| 21 | + | It is not suitable for creating patches for systems like Subversion and Git that need the Unified format. See: | |
| 22 | + | ``` | |
| 23 | + | <http://en.wikipedia.org/wiki/Diff#Unified_format> | |
| 24 | + | ``` | |
| 25 | + | ||
| 26 | + | It performs a line-based comparison (not a word- or paragraph-based) comparison, so it only works for text files (including source code), not binary files. | |
| 27 | + | ||
| 28 | + | ## Text1 | |
| 29 | + | ||
| 30 | + | Select the first file in the comparison. If any portion of text is selected within the file, then only this selected part of the text will be compared. | |
| 31 | + | ||
| 32 | + | ## Text2 | |
| 33 | + | ||
| 34 | + | Select the second file in the comparison. If any portion of text is selected within the file, then only this selected part of the text will be compared. | |
| 35 | + | ||
| 36 | + | ## Options | |
| 37 | + | ||
| 38 | + | * **Case sensitive** : Distinguishes between lowercase and upper-case (capital letter) characters. | |
| 39 | + | * **Ignore spaces at start of line** : Ignore any indent when comparing two lines (whether space ' ' or tab characters). | |
| 40 | + | * **Ignore differences in line ends** : A unix line ending #10 is treated as identical to a Windows line ending #13#10. | |
| 41 | + | * **Ignore spaces (newline chars not included)** : Ignore all spaces. 'A B' is the same as 'AB'. | |
| 42 | + | * **Ignore if empty lines were added or removed** : Skip empty lines. | |
| 43 | + | * **Ignore spaces at end of line** : Ignore trailing spaces when comparing two lines. | |
| 44 | + | * **Ignore amount of space characters** : Any number of consecutive spaces is treated as one space. | |
| 45 | + | ||
| 46 | + | ## Close | |
| 47 | + | ||
| 48 | + | Close this dialog. | |
| 49 | + | ||
| 50 | + | ## Open Diff in Editor | |
| 51 | + | ||
| 52 | + | Close the dialog and open a new page in the source editor with the diff. | |
| 53 | + | ||
| 54 | + | ## Save diff | |
| 55 | + | ||
| 56 | + | Opens a file dialog to save the diff to a file. | |
| 57 | + | ||
| 58 | + | --- | |
| 59 | + | *From the Free Pascal wiki, page "IDE Window: Diff", as the Internet Archive kept it on 2024-08-09. Copyright stays with the author who wrote it, according to the old wiki's [[Licensing]] page. If you have concerns about this material, [message the admin](/wiki-contact).* |