Changes between Version 5 and Version 6 of TracChangeset


Ignore:
Timestamp:
03/24/15 23:15:03 (2 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v5 v6  
    22[[TracGuideToc]]
    33
    4 Trac has a built-in functionality for visualizing “diffs”, or changes to files.
     4Trac has a built-in functionality for visualizing “diffs” - changes to files.
    55
    6 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.
     6There are different kinds of ''change sets''.
     7Some can correspond to revisions made in the repositories,
     8others can aggregate changes made in several revisions,
     9but in the end, any kind of differences can be shown.
    710
    8 The changeset view consists of two parts, the ''header'' and the ''diff views''.
     11The changeset view consists of two parts, the ''header''
     12and the ''diff views''.
    913
    1014== Changeset Header ==
     
    1923 * Files — A list of files affected by this changeset
    2024
    21 If more than one revision is involved in the set of changes being displayed, the ''Timestamp'', ''Author'' and ''Message'' fields will not be shown.
     25If more than one revision is involved in the set of changes being
     26displayed, the ''Timestamp'', ''Author'' and ''Message'' fields
     27won't be shown.
    2228
    23 A colored rectangle indicates how the file is affected by the changeset:
     29In front of each listed file, you'll find  a colored rectangle. The color
     30indicates how the file is affected by the changeset.
    2431 
    2532 [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Green: Added \\
     
    3239== Diff Views ==
    3340
    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:
     41Below 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):
    3542
    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.
     43 * 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.
     44 * 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.
    3845
    3946In 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.
     47 * You can set how many lines are displayed before and after every change
     48   (if the value ''all'' is used, then the full file will be shown)
     49 * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly
     50
    4251
    4352== The Different Ways to Get a Diff ==
     
    4554=== Examining a Changeset ===
    4655
    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.
     56When viewing a repository check-in, such as when following a
     57changeset [wiki:TracLinks link] or a changeset event in the
     58[wiki:TracTimeline timeline], Trac will display the exact changes
     59made by the check-in.
    4860
    49 There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''.
     61There will be also navigation links to the ''Previous Changeset''
     62to and ''Next Changeset''.
    5063
    5164=== Examining Differences Between Revisions ===
    5265
    53 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.
     66Often you'll want to look at changes made on a file
     67or on a directory spanning multiple revisions. The easiest way
     68to get there is from the TracRevisionLog, where you can select
     69the ''old'' and the ''new'' revisions of the file or directory, and
     70then click the ''View changes'' button.
    5471
    5572=== Examining Differences Between Branches ===
    5673
    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.
     74One of the core features of version control systems is the possibility
     75to work simultaneously on different ''Lines of Developments'', commonly
     76called “branches”. Trac enables you to examine the exact differences
     77between such branches.
    5878
    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.
     79Using the '''View changes ...''' button in the TracBrowser allows you to enter
     80''From:'' and ''To:'' path/revision pairs. The resulting set of differences consist
     81of the changes that should be applied to the ''From:'' content in order
     82to get to the ''To:'' content.
    6083
    61 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.
     84For convenience, it is possible to invert the roles of the ''old'' and the ''new''
     85path/revision pairs by clicking the ''Reverse Diff'' link on the changeset page.
    6286
    6387=== Checking the Last Change ===
    6488
    65 Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser.
     89The last possibility for examining changes is to use the ''Last Change''
     90link provided by the TracBrowser.
    6691
    67 This 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.
     92This link will take you to the last change that was made on that path.
     93From there, you can use the ''Previous Change'' and ''Next Change'' links
     94to traverse the change history of the file or directory.
    6895
    6996----