Changes between Version 1 and Version 2 of TracChangeset


Ignore:
Timestamp:
11/06/17 14:13:24 (4 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v1 v2  
    44Trac has a built-in functionality for visualizing “diffs” - changes to files. 
    55 
    6 When viewing a repository check-in, such as when following a 
    7 changeset [wiki:TracLinks link] or a changeset event in the  
    8 [wiki:TracTimeline timeline], Trac will display the exact changes 
    9 made by the check-in. 
     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. 
    1010 
    11 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''. 
    1213 
    1314== Changeset Header == 
     
    1617Here you will find information such as: 
    1718 
    18  * Timestamp -- When the changeset was commited 
    19  * Author -- Who commited the changeset 
    20  * Message -- A brief description from the author (the commit log message) 
    21  * 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. 
    2228 
    2329In front of each listed file, you'll find  a colored rectangle. The color 
    2430indicates how the file is affected by the changeset. 
    2531  
    26  * Green: Added 
    27  * Red: Removed 
    28  * Yellow: Modified 
    29  * Blue: Copied 
    30  * Gray: Moved 
    31  
     32 [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,`  `)]] Green: Added \\ 
     33 [[span(style=background:#f88;border:1px solid #999;font-size:80%;margin-right:.5em,`  `)]] Red: Removed \\ 
     34 [[span(style=background:#fd8;border:1px solid #999;font-size:80%;margin-right:.5em,`  `)]] Yellow: Modified \\ 
     35 [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,`  `)]] Blue: Copied \\ 
     36 [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,`  `)]] Gray: Moved \\ 
    3237The color legend is located below the header as a reminder. 
    3338 
     
    4146In addition, various advanced options are available in the preferences form for adjusting the display of the diffs: 
    4247 * 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) 
    4349 * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly 
     50 
     51 
     52== The Different Ways to Get a Diff == 
     53 
     54=== Examining a Changeset === 
     55 
     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. 
     60 
     61There will be also navigation links to the ''Previous Changeset'' 
     62to and ''Next Changeset''. 
     63 
     64=== Examining Differences Between Revisions === 
     65 
     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. 
     71 
     72=== Examining Differences Between Branches === 
     73 
     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. 
     78 
     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. 
     83 
     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. 
     86 
     87=== Checking the Last Change === 
     88 
     89The last possibility for examining changes is to use the ''Last Change'' 
     90link provided by the TracBrowser. 
     91 
     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. 
    4495 
    4596----