WordPress.org

Make WordPress Core

Changes between Version 1 and Version 2 of TracChangeset


Ignore:
Timestamp:
06/17/06 01:45:13 (8 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v1 v2  
    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” - changes to files. 
    55 
    6 == The Changeset View == 
     6When viewing a repository check-in, such as when following a 
     7changeset [wiki:TracLinks link] or a changeset event in the  
     8[wiki:TracTimeline timeline], Trac will display the exact changes 
     9made by the check-in. 
    710 
    8 When viewing a commited changeset, such as when clicking a changeset 
    9 [wiki:TracLinks TracLink] or a changeset event-line in the  
    10 [wiki:TracTimeline timeline], Trac will display what changes this current set of patches imposes. 
     11The changeset view consists of two parts, the ''header'' and the ''diff views''. 
    1112 
    12 The changeset view consists of two parts, the '''header''' and the '''diff view'''. 
    13  
    14 === Changeset Header === 
     13== Changeset Header == 
    1514 
    1615The header shows an overview of the whole changeset. 
     
    2827 * Red: Removed 
    2928 * Yellow: Modified 
     29 * Blue: Copied 
     30 * Gray: Moved 
    3031 
    3132The color legend is located below the header as a reminder. 
    3233 
    33 === Diff View === 
     34== Diff Views == 
    3435 
    3536Below 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): 
    3637 
    37  * The ''inline'' style shows the changed regions of a file underneath eachother. 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. 
    38  * The ''side-by-side'' style shows the old version of 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 on the left side 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 (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. 
    3940 
    4041In addition, various advanced options are available in the preferences form for adjusting the display of the diffs: