Changes between Version 2 and Version 3 of TracChangeset


Ignore:
Timestamp:
25 Jan 2017, 21:56:44 (11 months ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v2 v3  
    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” - changes to files.
     6Trac has a built-in functionality for visualizing "diffs", or changes to files.
    57
    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.
     8There 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.
    109
    11 The changeset view consists of two parts, the ''header''
    12 and the ''diff views''.
     10The changeset view consists of two parts, the ''header'' and the ''diff views''.
    1311
    14 == Changeset Header ==
     12== Changeset Header
    1513
    1614The header shows an overview of the whole changeset.
     
    2321 * Files — A list of files affected by this changeset
    2422
    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.
     23If more than one revision is involved in the set of changes being displayed, the ''Timestamp'', ''Author'' and ''Message'' fields will not be shown.
    2824
    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.
     25A colored rectangle indicates how the file is affected by the changeset:
    3126 
    32  * Green: Added
    33  * Red: Removed
    34  * Yellow: Modified
    35  * Blue: Copied
    36  * Gray: Moved
    37 
     27 [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Green: Added \\
     28 [[span(style=background:#f88;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Red: Removed \\
     29 [[span(style=background:#fd8;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Yellow: Modified \\
     30 [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Blue: Copied \\
     31 [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Gray: Moved \\
    3832The color legend is located below the header as a reminder.
    3933
    40 == Diff Views ==
     34== Diff Views
    4135
    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):
     36Below 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:
    4337
    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.
     38 * 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.
     39 * 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.
    4640
    4741In 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
     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.
    5144
     45== The Different Ways to Get a Diff
    5246
    53 == The Different Ways to Get a Diff ==
     47=== Examining a Changeset
    5448
    55 === Examining a Changeset ===
     49When 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.
    5650
    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.
     51There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''.
    6152
    62 There will be also navigation links to the ''Previous Changeset''
    63 to and ''Next Changeset''.
     53=== Examining Differences Between Revisions
    6454
    65 === Examining Differences Between Revisions ===
     55Often 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.
    6656
    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.
     57=== Examining Differences Between Branches
    7258
    73 === Examining Differences Between Branches ===
     59One 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.
    7460
    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.
     61Using 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.
    7962
    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.
     63For 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.
    8464
    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.
     65=== Checking the Last Change
    8766
    88 === Checking the Last Change ===
     67Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser.
    8968
    90 The last possibility for examining changes is to use the ''Last Change''
    91 link provided by the TracBrowser.
    92 
    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.
     69This 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.
    9670
    9771----