| 19 | | * Timestamp -- When the changeset was commited |
| 20 | | * Author -- Who commited the changeset |
| 21 | | * Message -- A brief description from the author (the commit log message) |
| 22 | | * Files -- A list of files affected by this changeset |
| | 17 | * Timestamp — When the changeset was commited |
| | 18 | * Author — Who commited the changeset |
| | 19 | * Message — A brief description from the author (the commit log message) |
| | 20 | * Location — Parent directory of all files affected by this changeset |
| | 21 | * Files — A list of files affected by this changeset |
| 27 | | * Green: Added |
| 28 | | * Red: Removed |
| 29 | | * Yellow: Modified |
| 30 | | |
| | 27 | [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Green: Added \\ |
| | 28 | [[span(style=background:#f88;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Red: Removed \\ |
| | 29 | [[span(style=background:#fd8;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Yellow: Modified \\ |
| | 30 | [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Blue: Copied \\ |
| | 31 | [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Gray: Moved \\ |
| 37 | | * The ''inline'' style shows the changed regions of a file underneath eachother. A region removed from the file will be colored red, an added region will be colored green. If a region was modified, the old version is displayed above the new version. Line numbers on the left side indicate the exact position of the change in both the old and the new version of the file. |
| 38 | | * The ''side-by-side'' style shows the old version of the left and the new version on the right (this will typically require more screen width than the inline style.) Added and removed regions will be colored in the same way as with the inline style (green and red, respectively), but modified regions will have a yellow background. |
| | 38 | * The ''inline'' style shows the changed regions of a file underneath each other. A region removed from the file will be colored red, an added region will be colored green. If a region was modified, the old version is displayed above the new version. Line numbers indicate the exact position of the change in both the old and the new version of the file. |
| | 39 | * The ''side-by-side'' style shows the old version on the left and the new version on the right and this will typically require more screen width than the inline style. Added and removed regions will be colored in the same way as with the inline style (green and red), and modified regions will have a yellow background. |
| 41 | | * You can set how many lines are displayed before and after every change |
| 42 | | * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly |
| | 42 | * You can set how many lines are displayed before and after every change; if the value ''all'' is used, then the full file will be shown. |
| | 43 | * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly. |
| | 44 | |
| | 45 | == The Different Ways to Get a Diff |
| | 46 | |
| | 47 | === Examining a Changeset |
| | 48 | |
| | 49 | When viewing a repository check-in, such as when following a changeset [wiki:TracLinks link] or a changeset event in the [wiki:TracTimeline timeline], Trac will display the exact changes made by the check-in. |
| | 50 | |
| | 51 | There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''. |
| | 52 | |
| | 53 | === Examining Differences Between Revisions |
| | 54 | |
| | 55 | Often you want to look at changes made on a file or on a directory spanning multiple revisions. The easiest way to get there is from the TracRevisionLog, where you can select the ''old'' and the ''new'' revisions of the file or directory, and then click the ''View changes'' button. |
| | 56 | |
| | 57 | === Examining Differences Between Branches |
| | 58 | |
| | 59 | One of the core features of version control systems is the possibility to work simultaneously on different ''Lines of Developments'', commonly called "branches". Trac enables you to examine the exact differences between such branches. |
| | 60 | |
| | 61 | Using the '''View changes ...''' button in the TracBrowser allows you to enter ''From:'' and ''To:'' path/revision pairs. The resulting set of differences consist of the changes that should be applied to the ''From:'' content to get to the ''To:'' content. |
| | 62 | |
| | 63 | For convenience, it is possible to invert the roles of the ''old'' and the ''new'' path/revision pairs by clicking the ''Reverse Diff'' link on the changeset page. |
| | 64 | |
| | 65 | === Checking the Last Change |
| | 66 | |
| | 67 | Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser. |
| | 68 | |
| | 69 | This link will take you to the last change that was made on that path. From there, you can use the ''Previous Change'' and ''Next Change'' links to traverse the change history of the file or directory. |
