Edgewall Software

Changes between Version 4 and Version 5 of TracDiff


Ignore:
Timestamp:
Jun 24, 2005, 7:31:20 PM (17 years ago)
Author:
Christian Boos
Comment:

Removed reference to old changesets

Legend:

Unmodified
Added
Removed
Modified
  • TracDiff

    v4 v5  
    11= Trac Diff Module =
    22
    3 ''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch.
    4 Please use [1792] for testing.''
     3''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch. It is also maintained in sync with recent (stable) trunk versions.''
    54
    65''Note 2: that page is a prototype for the Diff documentation. It will eventually be merged with the TracChangeset documentation page''.
     
    7069== Feedback ==
    7170
    72 In 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 
    76 For 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 ...
    81 C      trac\mimeview\api.py
    82 C      trac\wiki\formatter.py
    83 }}}
    84 Edit the conflicted files and solve the conflicts
    85 by selecting the {{{.working}}} version.
    86 
    87 I was thinking about providing a checkbox for each file entry
    88 in order to generate a ''diff'' containing only the selected changes
    89 (''cherry-picking support'').
    90 A similar feature has also been requested in #1662.
    91 
    9271
    9372''Please feel free to test, as the feature set won't change much now, and add your observations here''
    9473
     74
     75=== Cherry-picking support ===
     76
     77I was thinking about providing a checkbox for each file entry
     78in order to generate a ''diff'' containing only the selected changes.
     79A similar feature has also been requested in #1662.
     80
     81=== Diff/Patch ===
     82
     83I've noticed that the diffs that are produced using generalized diffs
     84are not really usable for {{{patch}}}. Especially for the added files.
     85
     86