Changes between Version 4 and Version 5 of TracChangeset
- Timestamp:
- 05/08/22 15:12:27 (3 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
TracChangeset
v4 v5 13 13 14 14 The header shows an overview of the whole changeset. 15 Here you will find information such as:15 Here you will find metadata: 16 16 17 17 * Timestamp — When the changeset was commited … … 24 24 25 25 A colored rectangle indicates how the file is affected by the changeset: 26 26 27 27 [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Green: Added \\ 28 28 [[span(style=background:#f88;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Red: Removed \\ … … 30 30 [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Blue: Copied \\ 31 31 [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,'' '')]] Gray: Moved \\ 32 The color legend is located below the header as a reminder. 32 33 The color legend is located below the header. 33 34 34 35 == Diff Views 35 36 36 Below the header is the main part of the changeset, the diff view. Each file is shown in a separate section , each of which contains only the regions of the file that are affected by the changeset. There are two different styles to display the diffs: ''inline'' or''side-by-side''. You can switch between the styles using the preferences form:37 Below the header is the main part of the changeset, the diff view. Each file is shown in a separate section. There are two different diff styles: ''inline'' and ''side-by-side''. You can switch between the styles using the preferences form: 37 38 38 39 * 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. … … 40 41 41 42 In addition, various advanced options are available in the preferences form for adjusting the display of the diffs: 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. 43 * You can set how many lines are displayed before and after every change, or display the changes in the context of the full file. 44 * You can toggle whether blank lines, case changes and white space changes are ignored. This can be useful in more easily locating the functional changes. 45 * You can toggle between contextual and unified diff views using the //Tabular// and //Unified// links at the top of each section. 44 46 45 47 == The Different Ways to Get a Diff … … 47 49 === Examining a Changeset 48 50 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.51 When viewing a repository check-in, such as when following a changeset [TracLinks link] or a changeset event in the [TracTimeline timeline], Trac will display the exact changes made by the check-in. 50 52 51 There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''. 53 There will also be navigation links to the ''Previous Changeset'' and the ''Next Changeset''. 54 55 === Downloading a Changeset 56 57 From the changeset view, the changeset can be downloaded in unified diff format using the links at the bottom of the page. The full content of each file in the changeset can also be downloaded as a zip archive. 52 58 53 59 === Examining Differences Between Revisions … … 59 65 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 66 61 Using the '''View changes ...''' button in the TracBrowser allows you toenter ''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.67 Following the '''View changes ...''' button in the TracBrowser leads to the diff page, where you can 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 68 63 69 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.
