Changes between Version 6 and Version 7 of TracChangeset
- Timestamp:
- 19/05/2016 16:30:56 (9 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
TracChangeset
v6 v7 1 = Trac Changeset Module = 1 = Trac Changeset Module 2 2 3 [[TracGuideToc]] 4 [[PageOutline(2-5,Contents,pullout)]] 3 5 4 Trac has a built-in functionality for visualizing “diffs”, or changes to files.6 Trac has a built-in functionality for visualizing "diffs", or changes to files. 5 7 6 8 There are different kinds of ''change sets''. Some correspond to revisions made in the repositories, others aggregate changes made in several revisions. Ultimately, any kind of difference can be shown. … … 8 10 The changeset view consists of two parts, the ''header'' and the ''diff views''. 9 11 10 == Changeset Header ==12 == Changeset Header 11 13 12 14 The header shows an overview of the whole changeset. … … 30 32 The color legend is located below the header as a reminder. 31 33 32 == Diff Views ==34 == Diff Views 33 35 34 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: … … 41 43 * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly. 42 44 43 == The Different Ways to Get a Diff ==45 == The Different Ways to Get a Diff 44 46 45 === Examining a Changeset ===47 === Examining a Changeset 46 48 47 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. … … 49 51 There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''. 50 52 51 === Examining Differences Between Revisions ===53 === Examining Differences Between Revisions 52 54 53 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. 54 56 55 === Examining Differences Between Branches ===57 === Examining Differences Between Branches 56 58 57 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.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. 58 60 59 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. … … 61 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. 62 64 63 === Checking the Last Change ===65 === Checking the Last Change 64 66 65 67 Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser.