Changes between Version 7 and Version 8 of TracChangeset


Ignore:
Timestamp:
10/02/17 20:17:00 (2 weeks ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v7 v8  
    1 = Trac Changeset Module =
     1= Trac Changeset Module
     2
    23[[TracGuideToc]]
     4[[PageOutline(2-5,Contents,pullout)]]
    35
    4 Trac has a built-in functionality for visualizing “diffs”, or changes to files.
     6Trac has a built-in functionality for visualizing "diffs", or changes to files.
    57
    68There 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.
     
    810The changeset view consists of two parts, the ''header'' and the ''diff views''.
    911
    10 == Changeset Header ==
     12== Changeset Header
    1113
    1214The header shows an overview of the whole changeset.
    13 Here you will find information such as:
     15Here you will find metadata:
    1416
    1517 * Timestamp — When the changeset was commited
     
    2830 [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Blue: Copied \\
    2931 [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Gray: Moved \\
    30 The color legend is located below the header as a reminder.
    3132
    32 == Diff Views ==
     33The color legend is located below the header.
    3334
    34 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:
     35== Diff Views
     36
     37Below 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:
    3538
    3639 * 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.
     
    3841
    3942In addition, various advanced options are available in the preferences form for adjusting the display of the diffs:
    40  * 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.
    41  * 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.
    4246
    43 == The Different Ways to Get a Diff ==
     47== The Different Ways to Get a Diff
    4448
    45 === Examining a Changeset ===
     49=== Examining a Changeset
    4650
    47 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.
     51When 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.
    4852
    49 There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''.
     53There will also be navigation links to the ''Previous Changeset'' and the ''Next Changeset''.
    5054
    51 === Examining Differences Between Revisions ===
     55=== Downloading a Changeset
     56
     57From 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.
     58
     59=== Examining Differences Between Revisions
    5260
    5361Often 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.
    5462
    55 === Examining Differences Between Branches ===
     63=== Examining Differences Between Branches
    5664
    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.
     65One 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.
    5866
    59 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.
     67Following 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.
    6068
    6169For 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.
    6270
    63 === Checking the Last Change ===
     71=== Checking the Last Change
    6472
    6573Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser.