| 37 | | * The ''inline'' style shows the changed regions of a file underneath each |
| 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. |
| | 43 | * 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 on the left side indicate the exact position of the change in both the old and the new version of the file. |
| | 44 | * The ''side-by-side'' style shows the old version on 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. |
| | 50 | |
| | 51 | |
| | 52 | == The Different Ways to Get a Diff == |
| | 53 | |
| | 54 | === Examining a Changeset === |
| | 55 | |
| | 56 | When viewing a repository check-in, such as when following a |
| | 57 | changeset [wiki:TracLinks link] or a changeset event in the |
| | 58 | [wiki:TracTimeline timeline], Trac will display the exact changes |
| | 59 | made by the check-in. |
| | 60 | |
| | 61 | There will be also navigation links to the ''Previous Changeset'' |
| | 62 | to and ''Next Changeset''. |
| | 63 | |
| | 64 | === Examining Differences Between Revisions === |
| | 65 | |
| | 66 | Often you'll want to look at changes made on a file |
| | 67 | or on a directory spanning multiple revisions. The easiest way |
| | 68 | to get there is from the TracRevisionLog, where you can select |
| | 69 | the ''old'' and the ''new'' revisions of the file or directory, and |
| | 70 | then click the ''View changes'' button. |
| | 71 | |
| | 72 | === Examining Differences Between Branches === |
| | 73 | |
| | 74 | One of the core features of version control systems is the possibility |
| | 75 | to work simultaneously on different ''Lines of Developments'', commonly |
| | 76 | called “branches”. Trac enables you to examine the exact differences |
| | 77 | between such branches. |
| | 78 | |
| | 79 | Using the '''View changes ...''' button in the TracBrowser allows you to enter |
| | 80 | ''From:'' and ''To:'' path/revision pairs. The resulting set of differences consist |
| | 81 | of the changes that should be applied to the ''From:'' content in order |
| | 82 | to get to the ''To:'' content. |
| | 83 | |
| | 84 | For convenience, it is possible to invert the roles of the ''old'' and the ''new'' |
| | 85 | path/revision pairs by clicking the ''Reverse Diff'' link on the changeset page. |
| | 86 | |
| | 87 | === Checking the Last Change === |
| | 88 | |
| | 89 | The last possibility for examining changes is to use the ''Last Change'' |
| | 90 | link provided by the TracBrowser. |
| | 91 | |
| | 92 | This link will take you to the last change that was made on that path. |
| | 93 | From there, you can use the ''Previous Change'' and ''Next Change'' links |
| | 94 | to traverse the change history of the file or directory. |
