Changes between Version 2 and Version 3 of TracChangeset


Ignore:
Timestamp:
Jun 6, 2013, 4:39:51 AM (19 months ago)
Author:
trac
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TracChangeset

    v2 v3  
    77Some can correspond to revisions made in the repositories,
    88others can aggregate changes made in several revisions,
    9 but in the end, any kind of differences could be shown.
     9but in the end, any kind of differences can be shown.
    1010
    1111The changeset view consists of two parts, the ''header''
     
    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
    2324
    2425If more than one revision is involved in the set of changes being
     
    2930indicates how the file is affected by the changeset.
    3031 
    31  * Green: Added
    32  * Red: Removed
    33  * Yellow: Modified
    34  * Blue: Copied
    35  * Gray: Moved
    36 
     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 \\
    3737The color legend is located below the header as a reminder.
    3838
     
    6262to and ''Next Changeset''.
    6363
    64 
    65 '''Note: all of the following will only be available in Trac [milestone:0.10]'''
    66 
    6764=== Examining Differences Between Revisions ===
    6865
    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.
     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.
    7571
    76 === Examining Arbitrary Differences ===
     72=== Examining Differences Between Branches ===
    7773
    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.
     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.
    8478
    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.
     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.
    8983
    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.
     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.
    9786
    9887=== Checking the Last Change ===
    9988
    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.
     89The last possibility for examining changes is to use the ''Last Change''
     90link provided by the TracBrowser.
    10391
    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 
     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.
    11695
    11796----