Changes between Version 3 and Version 4 of TracChangeset


Ignore:
Timestamp:
01/28/2011 02:52:13 PM (4 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v3 v4  
    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 ==
     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 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''
     12and the ''diff views''.
    1113
    12 The changeset view consists of two parts, the '''header''' and the '''diff view'''.
    13 
    14 === Changeset Header ===
     14== Changeset Header ==
    1515
    1616The header shows an overview of the whole changeset.
    1717Here you will find information such as:
    1818
    19  * Timestamp -- When the changeset was commited
    20  * Author -- Who commited the changeset
    21  * Message -- A brief description from the author (the commit log message)
    22  * Files -- A list of files affected by this changeset
     19 * Timestamp — When the changeset was commited
     20 * Author — Who commited the changeset
     21 * Message — A brief description from the author (the commit log message)
     22 * Location — Parent directory of all files affected by this changeset
     23 * Files — A list of files affected by this changeset
     24
     25If more than one revision is involved in the set of changes being
     26displayed, the ''Timestamp'', ''Author'' and ''Message'' fields
     27won't be shown.
    2328
    2429In front of each listed file, you'll find  a colored rectangle. The color
     
    2833 * Red: Removed
    2934 * Yellow: Modified
     35 * Blue: Copied
     36 * Gray: Moved
    3037
    3138The color legend is located below the header as a reminder.
    3239
    33 === Diff View ===
     40== Diff Views ==
    3441
    3542Below 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):
    3643
    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.
     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.
    3946
    4047In addition, various advanced options are available in the preferences form for adjusting the display of the diffs:
    4148 * 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)
    4250 * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly
     51
     52
     53== The Different Ways to Get a Diff ==
     54
     55=== Examining a Changeset ===
     56
     57When viewing a repository check-in, such as when following a
     58changeset [wiki:TracLinks link] or a changeset event in the
     59[wiki:TracTimeline timeline], Trac will display the exact changes
     60made by the check-in.
     61
     62There will be also navigation links to the ''Previous Changeset''
     63to and ''Next Changeset''.
     64
     65=== Examining Differences Between Revisions ===
     66
     67Often you'll want to look at changes made on a file
     68or on a directory spanning multiple revisions. The easiest way
     69to get there is from the TracRevisionLog, where you can select
     70the ''old'' and the ''new'' revisions of the file or directory, and
     71then click the ''View changes'' button.
     72
     73=== Examining Differences Between Branches ===
     74
     75One of the core features of version control systems is the possibility
     76to work simultaneously on different ''Lines of Developments'', commonly
     77called “branches”. Trac enables you to examine the exact differences
     78between such branches.
     79
     80Using the '''View changes ...''' button in the TracBrowser allows you to enter
     81''From:'' and ''To:'' path/revision pairs. The resulting set of differences consist
     82of the changes that should be applied to the ''From:'' content in order
     83to get to the ''To:'' content.
     84
     85For convenience, it is possible to invert the roles of the ''old'' and the ''new''
     86path/revision pairs by clicking the ''Reverse Diff'' link on the changeset page.
     87
     88=== Checking the Last Change ===
     89
     90The last possibility for examining changes is to use the ''Last Change''
     91link provided by the TracBrowser.
     92
     93This link will take you to the last change that was made on that path.
     94From there, you can use the ''Previous Change'' and ''Next Change'' links
     95to traverse the change history of the file or directory.
    4396
    4497----
Back to Top