Edgewall Software

Changes between Version 3 and Version 4 of TracDiff


Ignore:
Timestamp:
Jun 15, 2005, 10:29:34 AM (17 years ago)
Author:
Christian Boos
Comment:

Synchronized the documentation with [1792]

Legend:

Unmodified
Added
Removed
Modified
  • TracDiff

    v3 v4  
    11= Trac Diff Module =
    22
    3 ''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch. It's feature complete as of [1777]. Some refactoring work is still needed, though''
     3''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch.
     4Please use [1792] for testing.''
    45
    56''Note 2: that page is a prototype for the Diff documentation. It will eventually be merged with the TracChangeset documentation page''.
     
    2425between alternative versions.
    2526
    26 This is where Trac comes to the rescue: the TracBrowser
    27 allows any path in the repository, at any given revision
    28 to be selected as the ''Base for Diff'',
    29 i.e. the '''old''' file (or directory) which
    30 can be compared to any other existing '''new'''
    31 path/revision pair.
     27This is where Trac comes to the rescue: in the TracBrowser,
     28the path/revision currently examined can be selected
     29to be the ''Base'' (i.e. the ''old'' path/revision pair)
     30for a Diff operation.
     31The TracBrowser enters in a specific '''Diff''' mode reminding you
     32to select a ''Target'' (i.e. the ''new'' path/revision pair).
    3233
    3334The resulting set of differences consist in the changes
    34 that would be necessary to make on the ''Base'' in order
    35 to make it look like the target of the comparison.
     35that should be applied on the ''Base'' in order
     36to make it look like the ''Target'' of the Diff.
    3637
    3738For convenience, it is possible to invert the roles
    38 for the '''old''' and the '''new''' path/revision pairs.
     39for the '''old''' and the '''new''' path/revision pairs
     40by clicking the ''Reverse Diff'' link on the diff page.
    3941
    4042=== Checking the Last Changes ===
     
    4547
    4648This shows the relevant TracChangeset information, but
    47 
    4849restricted to the path being browsed, and with a link
    4950to the next ''Previous Diff'', making it convenient to
     
    5152
    5253Of course, if one is doing that on the root of the
    53 repository, there's will be no path restrictions
     54repository, there will be no path restriction
    5455and the full changeset will be shown.
     56
    5557
    5658== Looking at the Differences ==
    5759
    58 See TracChangeset for now, as the display is very similar.
     60See TracChangeset for now, as the display of the
     61differences is identical to what is described there.
     62Actually, the TracChangeset is now a particular case
     63of TracDiff.
    5964
    60 Except:
    61  * the Changeset information is shown only for the last mode
    62    (''Checking the Last Changes'')
    63  * the revision information for the individual files
    64    being examined is the one corresponding to their creation.
    65    This helps to discover which side is the ''real'' old file
    66    while examining parallel lines of development.
    67 
    68 In relation to the latest point, I'm thinking about providing
    69 a checkbox for each file entry in order to generate a ''diff''
    70 containing only the selected changes (''cherry-picking support'').
     65Note however that the Changeset information is only displayed
     66when it makes sense, i.e. when there's only one changeset involved
     67in the difference being examined.
    7168
    7269
    7370== Feedback ==
    7471
     72In order to test the above features:
     73 * either extract the branch, but it's slightly out-of-date compared to the trunk
     74 * or apply the changes on top of the trunk ([1792] as of this writing)
     75
     76For the second option:
     77{{{
     78$ cd trac/trunk
     79$ svn merge -r 1760:1792 http://svn.edgewall.com/repos/trac/branches/cboos-dev/anydiff-branch .
     80...
     81C      trac\mimeview\api.py
     82C      trac\wiki\formatter.py
     83}}}
     84Edit the conflicted files and solve the conflicts
     85by selecting the {{{.working}}} version.
     86
     87I was thinking about providing a checkbox for each file entry
     88in order to generate a ''diff'' containing only the selected changes
     89(''cherry-picking support'').
     90A similar feature has also been requested in #1662.
     91
     92
    7593''Please feel free to test, as the feature set won't change much now, and add your observations here''
    7694