Changes between Version 1 and Version 2 of TracChangeset


Ignore:
Timestamp:
02/24/2006 09:58:47 PM (10 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 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.
     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.
    1010
    11 The changeset view consists of two parts, the ''header''
    12 and the ''diff views''.
     11The changeset view consists of two parts, the ''header'' and the ''diff views''.
    1312
    1413== Changeset Header ==
     
    2120 * Message -- A brief description from the author (the commit log message)
    2221 * Files -- A list of files affected by this changeset
    23 
    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.
    2722
    2823In front of each listed file, you'll find  a colored rectangle. The color
     
    4641In addition, various advanced options are available in the preferences form for adjusting the display of the diffs:
    4742 * 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)
    4943 * 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 
    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.
    60 
    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]'''
    66 
    67 === Examining Differences Between Revisions ===
    68 
    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.
    75 
    76 === Examining Arbitrary Differences ===
    77 
    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.
    84 
    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.
    89 
    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.
    97 
    98 === Checking the Last Change ===
    99 
    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.
    103 
    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 
    11644
    11745----