Edgewall Software

Changes between Version 8 and Version 9 of TracChangeset


Ignore:
Timestamp:
Jan 20, 2006, 12:06:06 PM (18 years ago)
Author:
Christian Boos
Comment:

Integrated documentation for the TracDiff features

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v8 v9  
    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 could 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 ==
     
    2021 * Message -- A brief description from the author (the commit log message)
    2122 * Files -- A list of files affected by this changeset
     23
     24If more than one revision is involved in the set of changes being
     25displayed, the ''Timestamp'', ''Author'' and ''Message'' fields
     26won't be shown.
    2227
    2328In front of each listed file, you'll find  a colored rectangle. The color
     
    4348 * You can toggle whether blank lines, case changes and white space changes are ignored, thereby letting you find the functional changes more quickly
    4449
     50
     51== The Different Ways to Get a Diff ==
     52
     53=== Examining a Changeset ===
     54
     55When viewing a repository check-in, such as when following a
     56changeset [wiki:TracLinks link] or a changeset event in the
     57[wiki:TracTimeline timeline], Trac will display the exact changes
     58made by the check-in.
     59
     60There will be also navigation links to the ''Previous Changeset''
     61to and ''Next Changeset''.
     62
     63=== Examining Differences Between Revisions ===
     64
     65A very frequent need is to look at changes made on a file
     66or on a directory spanning multiple revisions.
     67The easiest way to get there is from the TracRevisionLog,
     68where one can select the '''old''' and the '''new''' revisions
     69of the path being examined, and then click the ''View changes''
     70button.
     71
     72=== Examining Arbitrary Differences ===
     73
     74One of the main feature of source configuration management
     75systems is the possibility to work simultaneously on alternate
     76''Lines of Developments'', or ''branches''.
     77The evolution of branches are often made in parallel, making it
     78sometimes difficult to understand the exact set of differences
     79between alternative versions.
     80
     81This is where Trac comes to the rescue:
     82the '''View changes ...''' button in the TracBrowser
     83leads to a form permitting the selection of arbitrary
     84''From:'' and ''To:'' path/revision pairs.
     85
     86The resulting set of differences consist in the changes
     87that should be applied to the ''From:'' content in order
     88to make it look like the ''To:'' content.
     89
     90For convenience, it is possible to invert the roles
     91of the '''old''' and the '''new''' path/revision pairs
     92by clicking the ''Reverse Diff'' link on the changeset page.
     93
     94=== Checking the Last Change ===
     95
     96The last possibility for looking at changes is
     97to have a quick look on the ''Last Change'' while
     98browsing a file or a directory.
     99
     100This shows the last change that happened on that path.
     101The links ''Previous Changeset'' and ''Next Changeset''
     102are replace by links to ''Previous Change'' and ''Next Change'',
     103which makes it really convenient to traverse the change history
     104of a specific file or directory.
     105This view of a changeset, restricted to a specific path,
     106is called ''restricted changeset''.
     107
     108Of course, if one is doing that on the root of the
     109repository, there will be no path restriction
     110and the full changeset will be shown.
     111
     112
    45113----
    46114See also: TracGuide, TracBrowser