Changes between Version 2 and Version 3 of TracChangeset


Ignore:
Timestamp:
Apr 20, 2015 8:51:57 PM (10 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • TracChangeset

    v2 v3  
    22[[TracGuideToc]]
    33
    4 Trac has a built-in functionality for visualizing “diffs” - changes to files.
     4Trac has a built-in functionality for visualizing “diffs”, or changes to files.
    55
    6 There are different kinds of ''change sets''.
    7 Some can correspond to revisions made in the repositories,
    8 others can aggregate changes made in several revisions,
    9 but in the end, any kind of differences can be shown.
     6There 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.
    107
    11 The changeset view consists of two parts, the ''header''
    12 and the ''diff views''.
     8The changeset view consists of two parts, the ''header'' and the ''diff views''.
    139
    1410== Changeset Header ==
    … …  
    2319 * Files — A list of files affected by this changeset
    2420
    25 If more than one revision is involved in the set of changes being
    26 displayed, the ''Timestamp'', ''Author'' and ''Message'' fields
    27 won't be shown.
     21If more than one revision is involved in the set of changes being displayed, the ''Timestamp'', ''Author'' and ''Message'' fields will not be shown.
    2822
    29 In front of each listed file, you'll find  a colored rectangle. The color
    30 indicates how the file is affected by the changeset.
     23A colored rectangle indicates how the file is affected by the changeset:
    3124 
    32  * Green: Added
    33  * Red: Removed
    34  * Yellow: Modified
    35  * Blue: Copied
    36  * Gray: Moved
    37 
     25 [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Green: Added \\
     26 [[span(style=background:#f88;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Red: Removed \\
     27 [[span(style=background:#fd8;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Yellow: Modified \\
     28 [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Blue: Copied \\
     29 [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Gray: Moved \\
    3830The color legend is located below the header as a reminder.
    3931
    4032== Diff Views ==
    4133
    42 Below the header is the main part of the changeset, the diff view. Each file is shown in a separate section, each of which will contain only the regions of the file that are affected by the changeset. There are two different styles of displaying the diffs: ''inline'' or ''side-by-side'' (you can switch between those styles using the preferences form):
     34Below 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:
    4335
    44  * 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.
    45  * 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.
     36 * 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.
     37 * 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.
    4638
    4739In addition, various advanced options are available in the preferences form for adjusting the display of the diffs:
    48  * You can set how many lines are displayed before and after every change
    49    (if the value ''all'' is used, then the full file will be shown)
    50  * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly
    51 
     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.
    5242
    5343== The Different Ways to Get a Diff ==
    … …  
    5545=== Examining a Changeset ===
    5646
    57 When viewing a repository check-in, such as when following a
    58 changeset [wiki:TracLinks link] or a changeset event in the
    59 [wiki:TracTimeline timeline], Trac will display the exact changes
    60 made by the check-in.
     47When 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.
    6148
    62 There will be also navigation links to the ''Previous Changeset''
    63 to and ''Next Changeset''.
     49There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''.
    6450
    6551=== Examining Differences Between Revisions ===
    6652
    67 Often you'll want to look at changes made on a file
    68 or on a directory spanning multiple revisions. The easiest way
    69 to get there is from the TracRevisionLog, where you can select
    70 the ''old'' and the ''new'' revisions of the file or directory, and
    71 then click the ''View changes'' button.
     53Often 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.
    7254
    7355=== Examining Differences Between Branches ===
    7456
    75 One of the core features of version control systems is the possibility
    76 to work simultaneously on different ''Lines of Developments'', commonly
    77 called “branches”. Trac enables you to examine the exact differences
    78 between such branches.
     57One 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.
    7958
    80 Using the '''View changes ...''' button in the TracBrowser allows you to enter
    81 ''From:'' and ''To:'' path/revision pairs. The resulting set of differences consist
    82 of the changes that should be applied to the ''From:'' content in order
    83 to get to the ''To:'' content.
     59Using 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.
    8460
    85 For convenience, it is possible to invert the roles of the ''old'' and the ''new''
    86 path/revision pairs by clicking the ''Reverse Diff'' link on the changeset page.
     61For 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.
    8762
    8863=== Checking the Last Change ===
    8964
    90 The last possibility for examining changes is to use the ''Last Change''
    91 link provided by the TracBrowser.
     65Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser.
    9266
    93 This link will take you to the last change that was made on that path.
    94 From there, you can use the ''Previous Change'' and ''Next Change'' links
    95 to traverse the change history of the file or directory.
     67This 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.
    9668
    9769----