Edgewall Software

Changes between Version 2 and Version 3 of TracChangeset


Ignore:
Timestamp:
Dec 10, 2015 6:49:38 AM (2 years ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v2 v3  
    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”, or changes to files.
    55
    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 could be shown.
     6There 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.
    107
    11 The changeset view consists of two parts, the ''header''
    12 and the ''diff views''.
     8The changeset view consists of two parts, the ''header'' and the ''diff views''.
    139
    1410== Changeset Header ==
     
    1713Here you will find information such as:
    1814
    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
     15 * Timestamp — When the changeset was commited
     16 * Author — Who commited the changeset
     17 * Message — A brief description from the author (the commit log message)
     18 * Location — Parent directory of all files affected by this changeset
     19 * Files — A list of files affected by this changeset
    2320
    24 If more than one revision is involved in the set of changes being
    25 displayed, the ''Timestamp'', ''Author'' and ''Message'' fields
    26 won't be shown.
     21If more than one revision is involved in the set of changes being displayed, the ''Timestamp'', ''Author'' and ''Message'' fields will not be shown.
    2722
    28 In front of each listed file, you'll find  a colored rectangle. The color
    29 indicates how the file is affected by the changeset.
     23A colored rectangle indicates how the file is affected by the changeset:
    3024 
    31  * Green: Added
    32  * Red: Removed
    33  * Yellow: Modified
    34  * Blue: Copied
    35  * Gray: Moved
    36 
     25 [[span(style=background:#bfb;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Green: Added \\
     26 [[span(style=background:#f88;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Red: Removed \\
     27 [[span(style=background:#fd8;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Yellow: Modified \\
     28 [[span(style=background:#88f;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Blue: Copied \\
     29 [[span(style=background:#ccc;border:1px solid #999;font-size:80%;margin-right:.5em,''  '')]] Gray: Moved \\
    3730The color legend is located below the header as a reminder.
    3831
    3932== Diff Views ==
    4033
    41 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):
     34Below 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:
    4235
    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.
     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.
    4538
    4639In addition, various advanced options are available in the preferences form for adjusting the display of the diffs:
    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 
     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.
    5142
    5243== The Different Ways to Get a Diff ==
     
    5445=== Examining a Changeset ===
    5546
    56 When viewing a repository check-in, such as when following a
    57 changeset [wiki:TracLinks link] or a changeset event in the
    58 [wiki:TracTimeline timeline], Trac will display the exact changes
    59 made by the check-in.
     47When 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.
    6048
    61 There will be also navigation links to the ''Previous Changeset''
    62 to and ''Next Changeset''.
    63 
    64 
    65 '''Note: all of the following will only be available in Trac [milestone:0.10]'''
     49There will be also navigation links to the ''Previous Changeset'' to and ''Next Changeset''.
    6650
    6751=== Examining Differences Between Revisions ===
    6852
    69 A very frequent need is to look at changes made on a file
    70 or on a directory spanning multiple revisions.
    71 The easiest way to get there is from the TracRevisionLog,
    72 where one can select the '''old''' and the '''new''' revisions
    73 of the path being examined, and then click the ''View changes''
    74 button.
     53Often 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.
    7554
    76 === Examining Arbitrary Differences ===
     55=== Examining Differences Between Branches ===
    7756
    78 One of the main feature of source configuration management
    79 systems is the possibility to work simultaneously on alternate
    80 ''Lines of Developments'', or ''branches''.
    81 The evolution of branches are often made in parallel, making it
    82 sometimes difficult to understand the exact set of differences
    83 between alternative versions.
     57One 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.
    8458
    85 This is where Trac comes to the rescue:
    86 the '''View changes ...''' button in the TracBrowser
    87 leads to a form permitting the selection of arbitrary
    88 ''From:'' and ''To:'' path/revision pairs.
     59Using 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.
    8960
    90 The resulting set of differences consist in the changes
    91 that should be applied to the ''From:'' content in order
    92 to make it look like the ''To:'' content.
    93 
    94 For convenience, it is possible to invert the roles
    95 of the '''old''' and the '''new''' path/revision pairs
    96 by clicking the ''Reverse Diff'' link on the changeset page.
     61For 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.
    9762
    9863=== Checking the Last Change ===
    9964
    100 The last possibility for looking at changes is
    101 to have a quick look on the ''Last Change'' while
    102 browsing a file or a directory.
     65Another way to examine changes is to use the ''Last Change'' link provided by the TracBrowser.
    10366
    104 This shows the last change that happened on that path.
    105 The links ''Previous Changeset'' and ''Next Changeset''
    106 are replace by links to ''Previous Change'' and ''Next Change'',
    107 which makes it really convenient to traverse the change history
    108 of a specific file or directory.
    109 This view of a changeset, restricted to a specific path,
    110 is called ''restricted changeset''.
    111 
    112 Of course, if one is doing that on the root of the
    113 repository, there will be no path restriction
    114 and the full changeset will be shown.
    115 
     67This 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.
    11668
    11769----